Menu
▾
▴
ebxmlms-commits — commit log
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(44) |
Aug
(98) |
Sep
(97) |
Oct
(130) |
Nov
(118) |
Dec
(102) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(139) |
Feb
(74) |
Mar
(128) |
Apr
(104) |
May
(121) |
Jun
(32) |
Jul
(29) |
Aug
(9) |
Sep
(16) |
Oct
|
Nov
(11) |
Dec
(29) |
| 2004 |
Jan
(15) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(9) |
Sep
(2) |
Oct
(9) |
Nov
(3) |
Dec
(2) |
| 2005 |
Jan
(1) |
Feb
(3) |
Mar
(3) |
Apr
|
May
(1) |
Jun
(5) |
Jul
|
Aug
(12) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2006 |
Jan
(3) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(1) |
Oct
(5) |
Nov
(5) |
Dec
|
| 2007 |
Jan
(2) |
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <kc...@us...> - 2003-05-27 06:53:34
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv28487
Modified Files:
MessageServer.java MessageServiceHandlerConfig.java
Constants.java
Log Message:
allow the user to specify null as toMshUrl... we assume the user will use the ToMshUrlResolver mechanism. at the end, if cannot resolve, an exception will be thrown
Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** MessageServer.java 22 May 2003 03:26:40 -0000 1.136
--- MessageServer.java 27 May 2003 06:53:30 -0000 1.137
***************
*** 2410,2414 ****
final ApplicationContext appContext = mshConfig.
getApplicationContext();
! final String toMshUrl = mshConfig.getToMshUrl().toString();
final MessageListener messageListener = mshConfig.getMessageListener();
final String transportType = mshConfig.getTransportType();
--- 2410,2415 ----
final ApplicationContext appContext = mshConfig.
getApplicationContext();
! final String toMshUrl = mshConfig.getToMshUrl() == null ?
! Constants.DEFAULT_TO_MSH_URL : mshConfig.getToMshUrl().toString();
final MessageListener messageListener = mshConfig.getMessageListener();
final String transportType = mshConfig.getTransportType();
***************
*** 2599,2604 ****
resultSet.getString(DbTableManager.ATTRIBUTE_SERVICE),
resultSet.getString(DbTableManager.ATTRIBUTE_ACTION));
! final URL toMshUrl = new URL
! (resultSet.getString(DbTableManager.ATTRIBUTE_TO_MSH_URL));
final String objectName = resultSet.
--- 2600,2608 ----
resultSet.getString(DbTableManager.ATTRIBUTE_SERVICE),
resultSet.getString(DbTableManager.ATTRIBUTE_ACTION));
! String urlStr = resultSet.getString(
! DbTableManager.ATTRIBUTE_TO_MSH_URL);
! final URL toMshUrl =
! urlStr.equals(Constants.DEFAULT_TO_MSH_URL) ?
! null : new URL(urlStr);
final String objectName = resultSet.
Index: MessageServiceHandlerConfig.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandlerConfig.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MessageServiceHandlerConfig.java 7 May 2003 03:52:29 -0000 1.14
--- MessageServiceHandlerConfig.java 27 May 2003 06:53:31 -0000 1.15
***************
*** 255,260 ****
oos.writeObject(appContext);
! byte[] bytes = toMshUrl.toString().
! getBytes(Constants.CHARACTER_ENCODING);
oos.writeInt(bytes.length);
oos.write(bytes);
--- 255,266 ----
oos.writeObject(appContext);
! byte[] bytes;
! if (toMshUrl == null) {
! bytes = Constants.DEFAULT_TO_MSH_URL
! .getBytes(Constants.CHARACTER_ENCODING);
! }
! else {
! bytes = toMshUrl.toString().getBytes(Constants.CHARACTER_ENCODING);
! }
oos.writeInt(bytes.length);
oos.write(bytes);
***************
*** 291,295 ****
byte[] bytes = new byte[ois.readInt()];
ois.read(bytes, 0, bytes.length);
! toMshUrl = new URL(new String(bytes, Constants.CHARACTER_ENCODING));
clientListener = (MessageListener) ois.readObject();
--- 297,307 ----
byte[] bytes = new byte[ois.readInt()];
ois.read(bytes, 0, bytes.length);
! String url = new String(bytes, Constants.CHARACTER_ENCODING);
! if (!url.equals(Constants.DEFAULT_TO_MSH_URL)) {
! toMshUrl = new URL(url);
! }
! else {
! toMshUrl = null;
! }
clientListener = (MessageListener) ois.readObject();
Index: Constants.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Constants.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Constants.java 27 May 2003 03:03:08 -0000 1.27
--- Constants.java 27 May 2003 06:53:31 -0000 1.28
***************
*** 950,952 ****
--- 950,957 ----
static final String SERIALIZABLE_OBJECT =
"application/octet-stream";
+
+ /**
+ * Default ToMshUrl
+ */
+ static final String DEFAULT_TO_MSH_URL = "<null>";
}
|
|
From: <kc...@us...> - 2003-05-27 06:51:12
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv27553
Modified Files:
MessageProcessor.java
Log Message:
now throw MessageServiceHandlerException when cannot resolve the outgoing URL to send
Index: MessageProcessor.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageProcessor.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** MessageProcessor.java 16 May 2003 08:41:03 -0000 1.47
--- MessageProcessor.java 27 May 2003 06:51:09 -0000 1.48
***************
*** 168,172 ****
MessageProcessor(EbxmlMessage ebxmlMessage,
MessageServiceHandlerConfig mshConfig,
! MessageServiceHandler msh) {
this(ebxmlMessage, mshConfig, msh, 0, 0);
}
--- 168,173 ----
MessageProcessor(EbxmlMessage ebxmlMessage,
MessageServiceHandlerConfig mshConfig,
! MessageServiceHandler msh)
! throws MessageServiceHandlerException {
this(ebxmlMessage, mshConfig, msh, 0, 0);
}
***************
*** 174,178 ****
MessageProcessor(EbxmlMessage ebxmlMessage,
MessageServiceHandlerConfig mshConfig,
! MessageServiceHandler msh, int startTry, long latency) {
logger.debug("=> MessageProcessor.MessageProcessor");
--- 175,180 ----
MessageProcessor(EbxmlMessage ebxmlMessage,
MessageServiceHandlerConfig mshConfig,
! MessageServiceHandler msh, int startTry, long latency)
! throws MessageServiceHandlerException {
logger.debug("=> MessageProcessor.MessageProcessor");
***************
*** 212,215 ****
--- 214,225 ----
retries = mshConfig.getRetries();
retryInterval = Long.parseLong(mshConfig.getRetryInterval());
+
+ if (toMshUrl == null) {
+ String err = ErrorMessages.getMessage(
+ ErrorMessages.ERR_HERMES_UNKNOWN_DESTINATION,
+ "Cannot resolve outgoing URL to send");
+ logger.warn(err);
+ throw new MessageServiceHandlerException(err);
+ }
logger.debug("<= MessageProcessor.MessageProcessor");
|
|
From: <kc...@us...> - 2003-05-27 06:49:49
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv26741
Modified Files:
Transaction.java
Log Message:
added missing logging statement
Index: Transaction.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Transaction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Transaction.java 27 May 2003 03:33:46 -0000 1.14
--- Transaction.java 27 May 2003 06:49:40 -0000 1.15
***************
*** 243,246 ****
--- 243,247 ----
String err = ErrorMessages.getMessage(
ErrorMessages.ERR_DB_CANNOT_WRITE, e);
+ logger.warn(err);
throw new TransactionException(err);
}
***************
*** 248,251 ****
--- 249,253 ----
String err = ErrorMessages.getMessage(
ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
+ logger.error(err);
throw new TransactionException(err);
}
|
|
From: <kc...@us...> - 2003-05-27 06:49:00
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv26386
Modified Files:
ErrorMessages.java
Log Message:
added a new error code, representing unable to resolve to msh url
Index: ErrorMessages.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/ErrorMessages.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ErrorMessages.java 12 May 2003 02:56:26 -0000 1.17
--- ErrorMessages.java 27 May 2003 06:48:57 -0000 1.18
***************
*** 94,97 ****
--- 94,98 ----
public static final int ERR_HERMES_UNKNOWN_APP_CONTEXT = 10012;
public static final int ERR_HERMES_ZIP_IO_ERROR = 10013;
+ public static final int ERR_HERMES_UNKNOWN_DESTINATION = 10014;
public static final int ERR_SMTP_INVALID_SERVER = 10101;
***************
*** 159,162 ****
--- 160,164 ----
load(ERR_HERMES_UNKNOWN_APP_CONTEXT, "Unknown application context");
load(ERR_HERMES_ZIP_IO_ERROR, "Error reading/writing ZIP stream");
+ load(ERR_HERMES_UNKNOWN_DESTINATION, "Unknown destination");
load(ERR_SMTP_INVALID_SERVER, "Invalid SMTP server");
|
|
From: <kc...@us...> - 2003-05-27 03:33:48
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv6268/src/hk/hku/cecid/phoenix/message/handler
Modified Files:
Transaction.java
Log Message:
missing logging statement
Index: Transaction.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Transaction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Transaction.java 20 May 2003 09:40:35 -0000 1.13
--- Transaction.java 27 May 2003 03:33:46 -0000 1.14
***************
*** 346,349 ****
--- 346,350 ----
ErrorMessages.ERR_HERMES_FILE_IO_ERROR, e,
"cannot read object from file <" + filename + ">");
+ logger.error(err);
throw new TransactionException(err);
}
***************
*** 352,355 ****
--- 353,357 ----
ErrorMessages.ERR_HERMES_FILE_IO_ERROR, e,
"cannot read object from file <" + filename + ">");
+ logger.error(err);
throw new TransactionException(err);
}
***************
*** 357,360 ****
--- 359,363 ----
String err = ErrorMessages.getMessage(
ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
+ logger.error(err);
throw new TransactionException(err);
}
|
|
From: <kc...@us...> - 2003-05-27 03:30:59
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv5367
Modified Files:
Tag: b0931
Utility.java
Log Message:
update version number
Index: Utility.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Utility.java,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -C2 -d -r1.18.2.7 -r1.18.2.8
*** Utility.java 21 May 2003 08:12:51 -0000 1.18.2.7
--- Utility.java 27 May 2003 03:30:56 -0000 1.18.2.8
***************
*** 116,120 ****
* implementation.
*/
! private static final String RELEASE = "0.9.3.1-rc3";
/**
--- 116,120 ----
* implementation.
*/
! private static final String RELEASE = "0.9.3.1-rc4";
/**
|
|
From: <kc...@us...> - 2003-05-27 03:30:32
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv5246
Modified Files:
Tag: b0931
Transaction.java
Log Message:
missing logging statement
Index: Transaction.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Transaction.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** Transaction.java 18 May 2003 02:15:03 -0000 1.9.2.3
--- Transaction.java 27 May 2003 03:30:29 -0000 1.9.2.4
***************
*** 342,345 ****
--- 342,346 ----
ErrorMessages.ERR_HERMES_FILE_IO_ERROR, e,
"cannot read object from file <" + filename + ">");
+ logger.error(err);
throw new TransactionException(err);
}
***************
*** 348,351 ****
--- 349,353 ----
ErrorMessages.ERR_HERMES_FILE_IO_ERROR, e,
"cannot read object from file <" + filename + ">");
+ logger.error(err);
throw new TransactionException(err);
}
***************
*** 353,356 ****
--- 355,359 ----
String err = ErrorMessages.getMessage(
ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
+ logger.error(err);
throw new TransactionException(err);
}
|
|
From: <kc...@us...> - 2003-05-27 03:20:13
|
Update of /cvsroot/ebxmlms/ebxmlms/conf In directory sc8-pr-cvs1:/tmp/cvs-serv3381/conf Modified Files: log4j.properties Log Message: update log path Index: log4j.properties =================================================================== RCS file: /cvsroot/ebxmlms/ebxmlms/conf/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4j.properties 27 May 2003 03:03:08 -0000 1.1 --- log4j.properties 27 May 2003 03:20:10 -0000 1.2 *************** *** 2,6 **** log4j.appender.A=org.apache.log4j.RollingFileAppender ! log4j.appender.A.File=/ebxml/staff/kcyee/work/msh/logs/msh1.log log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%d %-5p [%t]: %m%n --- 2,6 ---- log4j.appender.A=org.apache.log4j.RollingFileAppender ! log4j.appender.A.File=/hermes/logs/msh.log log4j.appender.A.layout=org.apache.log4j.PatternLayout log4j.appender.A.layout.ConversionPattern=%d %-5p [%t]: %m%n |
|
From: <kc...@us...> - 2003-05-27 03:03:11
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv31435/src/hk/hku/cecid/phoenix/message/handler
Modified Files:
Constants.java Utility.java
Log Message:
added external configuration for log4j
Index: Constants.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Constants.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Constants.java 13 May 2003 04:28:56 -0000 1.26
--- Constants.java 27 May 2003 03:03:08 -0000 1.27
***************
*** 237,242 ****
* Path to access the logger used in configuration file.
*/
! public static final String PROPERTY_USE_LOGGER =
! "MSH/Log/UseLogger";
/**
--- 237,242 ----
* Path to access the logger used in configuration file.
*/
! public static final String PROPERTY_EXTERNAL_LOGGER_CONFIG =
! "MSH/Log/ExternalProperties";
/**
***************
*** 386,391 ****
*/
! public static final String PROPERTY_REQUEST_USE_LOGGER =
! "Request/Log/UseLogger";
public static final String PROPERTY_REQUEST_LOG_PATH =
--- 386,391 ----
*/
! public static final String PROPERTY_REQUEST_EXTERNAL_LOGGER_CONFIG =
! "Request/Log/ExternalProperties";
public static final String PROPERTY_REQUEST_LOG_PATH =
Index: Utility.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Utility.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Utility.java 9 Apr 2003 07:48:06 -0000 1.20
--- Utility.java 27 May 2003 03:03:08 -0000 1.21
***************
*** 127,130 ****
--- 127,132 ----
private static DocumentBuilder documentBuilder = null;
+ private static boolean loggingConfigured = false;
+
// Set up message counter
private static void init() {
***************
*** 477,480 ****
--- 479,494 ----
throws InitializationException {
+ String externalProperties = prop.get(
+ Constants.PROPERTY_EXTERNAL_LOGGER_CONFIG);
+ if (externalProperties != null &&
+ (new File(externalProperties)).exists() &&
+ !loggingConfigured) {
+ System.err.println("Info: loading LOG4J properties file at "
+ + externalProperties);
+ PropertyConfigurator.configure(externalProperties);
+ loggingConfigured = true;
+ return;
+ }
+
String logPath = prop.get(Constants.PROPERTY_LOG_PATH);
String logFile = prop.get(Constants.PROPERTY_LOG_FILE);
***************
*** 487,490 ****
--- 501,516 ----
public static void configureClientLogger(Property prop, String umbrella)
throws InitializationException {
+
+ String externalProperties = prop.get(
+ Constants.PROPERTY_REQUEST_EXTERNAL_LOGGER_CONFIG);
+ if (externalProperties != null &&
+ (new File(externalProperties)).exists() &&
+ !loggingConfigured) {
+ System.err.println("Info: loading LOG4J properties file at "
+ + externalProperties);
+ PropertyConfigurator.configure(externalProperties);
+ loggingConfigured = true;
+ return;
+ }
String logPath = prop.get(Constants.PROPERTY_REQUEST_LOG_PATH);
|
|
From: <kc...@us...> - 2003-05-27 03:03:11
|
Update of /cvsroot/ebxmlms/ebxmlms/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv31435/conf
Modified Files:
msh.properties.xml
Added Files:
log4j.properties
Log Message:
added external configuration for log4j
--- NEW FILE: log4j.properties ---
log4j.rootLogger=DEBUG, A
log4j.appender.A=org.apache.log4j.RollingFileAppender
log4j.appender.A.File=/ebxml/staff/kcyee/work/msh/logs/msh1.log
log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%d %-5p [%t]: %m%n
log4j.appender.A.MaxFileSize=1KB
log4j.appender.A.MaxBackupIndex=20
Index: msh.properties.xml
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/conf/msh.properties.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** msh.properties.xml 5 May 2003 08:56:47 -0000 1.23
--- msh.properties.xml 27 May 2003 03:03:08 -0000 1.24
***************
*** 3,8 ****
<MSH>
<Log>
! <!-- "JDK" or "LOG4J" -->
! <UseLogger>LOG4J</UseLogger>
<!-- empty path: user.home -->
<LogPath>/hermes</LogPath>
--- 3,12 ----
<MSH>
<Log>
! <!-- ExternalProperties optionally points to an external file for
! configuring LOG4J. If specified, the following parameters
! (LogPath, LogFile, etc) will not be used -->
! <!--
! <ExternalProperties>/path/to/log4j.properties</ExternalProperties>
! -->
<!-- empty path: user.home -->
<LogPath>/hermes</LogPath>
|
|
From: <kc...@us...> - 2003-05-27 03:02:21
|
Update of /cvsroot/ebxmlms/ebxmlms/doc In directory sc8-pr-cvs1:/tmp/cvs-serv31257 Modified Files: change.txt Log Message: update change log Index: change.txt =================================================================== RCS file: /cvsroot/ebxmlms/ebxmlms/doc/change.txt,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** change.txt 15 May 2003 08:21:09 -0000 1.96 --- change.txt 27 May 2003 03:02:17 -0000 1.97 *************** *** 647,648 **** --- 647,650 ---- changed to use to party id as party id of the acknowledgment whenever possible + + added external configuration method for log4j |
|
From: <kc...@us...> - 2003-05-27 02:44:59
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv25940
Modified Files:
MessageServiceHandler.java
Log Message:
remove tab characters
Index: MessageServiceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandler.java,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** MessageServiceHandler.java 21 May 2003 08:12:20 -0000 1.168
--- MessageServiceHandler.java 27 May 2003 02:44:56 -0000 1.169
***************
*** 784,792 ****
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! try {
! File f = new File(listenerDirs.nextToken());
! trustedListenerRepository.add(f.getCanonicalPath());
! }
! catch (IOException e) {}
}
}
--- 784,792 ----
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! try {
! File f = new File(listenerDirs.nextToken());
! trustedListenerRepository.add(f.getCanonicalPath());
! }
! catch (IOException e) {}
}
}
***************
*** 1510,1520 ****
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! File clientUrlFile = new File(clientUrl.getPath());
! boolean isServerRepository = false;
! try {
! isServerRepository = trustedListenerRepository.contains(
! clientUrlFile.getCanonicalPath());
! }
! catch (IOException e) {}
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
--- 1510,1520 ----
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! File clientUrlFile = new File(clientUrl.getPath());
! boolean isServerRepository = false;
! try {
! isServerRepository = trustedListenerRepository.contains(
! clientUrlFile.getCanonicalPath());
! }
! catch (IOException e) {}
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
|
|
From: <kc...@us...> - 2003-05-27 02:21:54
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler In directory sc8-pr-cvs1:/tmp/cvs-serv20116/src/hk/hku/cecid/phoenix/message/handler Modified Files: DeliveryRecord.java Log Message: remove unused import statement Index: DeliveryRecord.java =================================================================== RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/DeliveryRecord.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DeliveryRecord.java 25 May 2003 04:12:26 -0000 1.9 --- DeliveryRecord.java 27 May 2003 02:21:51 -0000 1.10 *************** *** 69,73 **** package hk.hku.cecid.phoenix.message.handler; - import java.util.Iterator; import java.util.Set; import java.util.TreeSet; --- 69,72 ---- |
|
From: <cy...@us...> - 2003-05-25 04:44:38
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv13198
Modified Files:
DeliveryRecord.java
Log Message:
Bug fix: lastDelivered should be reset to -1 if the last message is really
delivered and there is no more undelivered message left. Thus, this
DeliveryRecord can be reused to received MessageOrder for the same
conversationId.
Index: DeliveryRecord.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/DeliveryRecord.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DeliveryRecord.java 18 May 2003 02:16:08 -0000 1.8
--- DeliveryRecord.java 25 May 2003 04:12:26 -0000 1.9
***************
*** 110,113 ****
--- 110,114 ----
private int lastDelivered;
+ private int prevLastDelivered;
private Set undeliveredSet;
***************
*** 115,118 ****
--- 116,120 ----
undeliveredSet = new TreeSet();
lastDelivered = -1;
+ prevLastDelivered = 0;
}
***************
*** 124,132 ****
lastDelivered++;
undeliveredSet.remove(new Integer(lastDelivered));
}
void decLastDelivered() {
! undeliveredSet.add(new Integer(lastDelivered));
! lastDelivered--;
}
--- 126,145 ----
lastDelivered++;
undeliveredSet.remove(new Integer(lastDelivered));
+ if (undeliveredSet.isEmpty()) {
+ prevLastDelivered = lastDelivered;
+ lastDelivered = -1;
+ }
}
void decLastDelivered() {
! if (lastDelivered != -1) {
! undeliveredSet.add(new Integer(lastDelivered));
! lastDelivered--;
! }
! else {
! undeliveredSet.add(new Integer(prevLastDelivered));
! lastDelivered = prevLastDelivered - 1;
! prevLastDelivered = 0;
! }
}
|
|
From: <cy...@us...> - 2003-05-25 04:12:02
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv12549
Modified Files:
Tag: b0931
DeliveryRecord.java
Log Message:
Bug fix: lastDelivered should be reset to -1 if the last message is really
delivered and there is no more undelivered message left. Thus, this
DeliveryRecord can be reused to received MessageOrder for the same
conversationId.
Index: DeliveryRecord.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/DeliveryRecord.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -d -r1.6.2.2 -r1.6.2.3
*** DeliveryRecord.java 18 May 2003 02:15:02 -0000 1.6.2.2
--- DeliveryRecord.java 25 May 2003 04:11:58 -0000 1.6.2.3
***************
*** 110,113 ****
--- 110,114 ----
private int lastDelivered;
+ private int prevLastDelivered;
private Set undeliveredSet;
***************
*** 115,118 ****
--- 116,120 ----
undeliveredSet = new TreeSet();
lastDelivered = -1;
+ prevLastDelivered = 0;
}
***************
*** 124,132 ****
lastDelivered++;
undeliveredSet.remove(new Integer(lastDelivered));
}
void decLastDelivered() {
! undeliveredSet.add(new Integer(lastDelivered));
! lastDelivered--;
}
--- 126,145 ----
lastDelivered++;
undeliveredSet.remove(new Integer(lastDelivered));
+ if (undeliveredSet.isEmpty()) {
+ prevLastDelivered = lastDelivered;
+ lastDelivered = -1;
+ }
}
void decLastDelivered() {
! if (lastDelivered != -1) {
! undeliveredSet.add(new Integer(lastDelivered));
! lastDelivered--;
! }
! else {
! undeliveredSet.add(new Integer(prevLastDelivered));
! lastDelivered = prevLastDelivered - 1;
! prevLastDelivered = 0;
! }
}
|
|
From: <kc...@us...> - 2003-05-23 01:59:21
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/monitor
In directory sc8-pr-cvs1:/tmp/cvs-serv1132/src/hk/hku/cecid/phoenix/message/monitor
Modified Files:
SendPanel.java
Log Message:
set duplicate elimination is implicit for message order
Index: SendPanel.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/monitor/SendPanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SendPanel.java 9 Apr 2003 07:48:14 -0000 1.18
--- SendPanel.java 23 May 2003 01:59:18 -0000 1.19
***************
*** 765,769 ****
}
! if (reliableBox.isSelected() && duplicateBox.isSelected()) {
msgHeader.setDuplicateElimination();
}
--- 765,770 ----
}
! if (reliableBox.isSelected() && duplicateBox.isSelected() &&
! !enableMessageOrderBox.isSelected()) {
msgHeader.setDuplicateElimination();
}
|
|
From: <kc...@us...> - 2003-05-23 01:57:19
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/monitor
In directory sc8-pr-cvs1:/tmp/cvs-serv628/src/hk/hku/cecid/phoenix/message/monitor
Modified Files:
Tag: b0931
SendPanel.java
Log Message:
set duplicate elimination is implicit for message order
Index: SendPanel.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/monitor/SendPanel.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -d -r1.17.2.1 -r1.17.2.2
*** SendPanel.java 9 Apr 2003 08:41:40 -0000 1.17.2.1
--- SendPanel.java 23 May 2003 01:57:15 -0000 1.17.2.2
***************
*** 765,769 ****
}
! if (reliableBox.isSelected() && duplicateBox.isSelected()) {
msgHeader.setDuplicateElimination();
}
--- 765,770 ----
}
! if (reliableBox.isSelected() && duplicateBox.isSelected() &&
! !enableMessageOrderBox.isSelected()) {
msgHeader.setDuplicateElimination();
}
|
|
From: <cy...@us...> - 2003-05-22 03:26:42
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv31338
Modified Files:
MessageServer.java
Log Message:
Bug fix: already delivered message cannot be delivered again.
Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** MessageServer.java 20 May 2003 09:40:34 -0000 1.135
--- MessageServer.java 22 May 2003 03:26:40 -0000 1.136
***************
*** 1191,1200 ****
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! String err = ErrorMessages.getMessage(
! ErrorMessages.ERR_DB_DATA_INCONSISTENT,
! "delivered message is set to <delivered> status "
! + "again");
! logger.warn(err);
! throw new MessageServerException(err);
}
else {
--- 1191,1198 ----
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! logger.info("messageId=<" + messageId +
! "> is delivered again");
! newSeqNo = seqNo;
! throw new MessageServerException("");
}
else {
***************
*** 1324,1333 ****
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! String err = ErrorMessages.getMessage(
! ErrorMessages.ERR_DB_DATA_INCONSISTENT,
! "delivered message is set to <delivered> status "
! + "again");
! logger.warn(err);
! throw new MessageServerException(err);
}
else {
--- 1322,1329 ----
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! logger.info("filename=<" + filename +
! "> is delivered again");
! newSeqNo = seqNo;
! throw new MessageServerException("");
}
else {
|
|
From: <cy...@us...> - 2003-05-22 03:25:57
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv30769
Modified Files:
Tag: b0931
MessageServer.java
Log Message:
Bug fix: already delivered message cannot be delivered again.
Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.119.2.9
retrieving revision 1.119.2.10
diff -C2 -d -r1.119.2.9 -r1.119.2.10
*** MessageServer.java 21 May 2003 15:09:16 -0000 1.119.2.9
--- MessageServer.java 22 May 2003 03:25:53 -0000 1.119.2.10
***************
*** 1191,1200 ****
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! String err = ErrorMessages.getMessage(
! ErrorMessages.ERR_DB_DATA_INCONSISTENT,
! "delivered message is set to <delivered> status "
! + "again");
! logger.warn(err);
! throw new MessageServerException(err);
}
else {
--- 1191,1198 ----
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! logger.info("messageId=<" + messageId +
! "> is delivered again");
! newSeqNo = seqNo;
! throw new MessageServerException("");
}
else {
***************
*** 1324,1333 ****
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! String err = ErrorMessages.getMessage(
! ErrorMessages.ERR_DB_DATA_INCONSISTENT,
! "delivered message is set to <delivered> status "
! + "again");
! logger.warn(err);
! throw new MessageServerException(err);
}
else {
--- 1322,1329 ----
if (isDelivered) {
if (seqNo == FIRST_MESSAGE_DELIVERED) {
! logger.info("filename=<" + filename +
! "> is delivered again");
! newSeqNo = seqNo;
! throw new MessageServerException("");
}
else {
|
|
From: <cy...@us...> - 2003-05-21 15:09:22
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv20508
Modified Files:
Tag: b0931
MessageServer.java MessageServiceHandler.java
Log Message:
Bug fix: cannot get undelivered messages with MessageOrder semantics.
Index: MessageServer.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServer.java,v
retrieving revision 1.119.2.8
retrieving revision 1.119.2.9
diff -C2 -d -r1.119.2.8 -r1.119.2.9
*** MessageServer.java 20 May 2003 08:57:09 -0000 1.119.2.8
--- MessageServer.java 21 May 2003 15:09:16 -0000 1.119.2.9
***************
*** 3418,3421 ****
--- 3418,3426 ----
static EbxmlMessage getMessageFromFile(File file)
throws MessageServerException {
+ return (EbxmlMessage) getMessageFromFile(file, true);
+ }
+
+ static Object getMessageFromFile(File file, boolean withAttachments)
+ throws MessageServerException {
logger.debug("=> MessageServer.getMessageFromFile");
***************
*** 3502,3510 ****
final MimeHeaders headers = new MimeHeaders();
headers.addHeader(Constants.CONTENT_TYPE, Constants.TEXT_XML_TYPE);
! final SOAPMessage soapMessage = MessageFactory.newInstance().
! createMessage (headers, new ByteArrayInputStream
! (soapMessageBytes, 0, lastIndex + 1));
! if (boundary != null) {
lastIndex = line.length - 1;
for ( ; lastIndex >= 0 ; lastIndex--) {
--- 3507,3524 ----
final MimeHeaders headers = new MimeHeaders();
headers.addHeader(Constants.CONTENT_TYPE, Constants.TEXT_XML_TYPE);
! final SOAPMessage soapMessage;
! try {
! soapMessage = MessageFactory.newInstance().createMessage
! (headers, new ByteArrayInputStream(soapMessageBytes, 0,
! lastIndex + 1));
! }
! catch (Exception e) {
! String err = ErrorMessages.getMessage
! (ErrorMessages.ERR_SOAP_CANNOT_CREATE_OBJECT, e);
! logger.warn(err);
! throw new MessageServerException(err);
! }
! if (boundary != null && withAttachments) {
lastIndex = line.length - 1;
for ( ; lastIndex >= 0 ; lastIndex--) {
***************
*** 3650,3657 ****
fileStream.close();
! EbxmlMessage ret = new EbxmlMessage(soapMessage);
! ret.setFileName(file.getCanonicalPath());
logger.debug("<= MessageServer.getMessageFromFile");
! return ret;
}
catch (MessageServerException e) {
--- 3664,3676 ----
fileStream.close();
! if (withAttachments) {
! EbxmlMessage message = new EbxmlMessage(soapMessage);
! message.setFileName(file.getCanonicalPath());
! logger.debug("<= MessageServer.getMessageFromFile");
! return message;
! }
!
logger.debug("<= MessageServer.getMessageFromFile");
! return soapMessage;
}
catch (MessageServerException e) {
Index: MessageServiceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandler.java,v
retrieving revision 1.148.2.16
retrieving revision 1.148.2.17
diff -C2 -d -r1.148.2.16 -r1.148.2.17
*** MessageServiceHandler.java 21 May 2003 08:10:53 -0000 1.148.2.16
--- MessageServiceHandler.java 21 May 2003 15:09:17 -0000 1.148.2.17
***************
*** 615,620 ****
try {
String fileName = (String) results.get(i);
! EbxmlMessage ebxmlMessage = MessageServer.
! getMessageFromFile(new File(fileName));
messageListener.onMessage(ebxmlMessage);
tx = new Transaction(MessageServer.dbConnectionPool);
--- 615,621 ----
try {
String fileName = (String) results.get(i);
! EbxmlMessage ebxmlMessage =
! MessageServer.getMessageFromFile
! (new File(msh.messageRepository, fileName));
messageListener.onMessage(ebxmlMessage);
tx = new Transaction(MessageServer.dbConnectionPool);
***************
*** 2069,2072 ****
--- 2070,2081 ----
int seqNo = ((Integer) list.get(1)).intValue();
String fileName = (String) list.get(2);
+
+ if (conversationId.equals(WILD_CARD)) {
+ SOAPMessage soapMessage = (SOAPMessage)
+ MessageServer.getMessageFromFile
+ (new File(messageRepository, fileName), false);
+ EbxmlMessage ebxmlMessage = new EbxmlMessage(soapMessage);
+ conversationId = ebxmlMessage.getConversationId();
+ }
DeliveryRecord record = null;
|
|
From: <cy...@us...> - 2003-05-21 14:18:33
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv3798
Modified Files:
HttpSender.java MailSender.java
Log Message:
Bug fix: exceptionMessage in parent class (MessageSender) should be set in
order to report the correct error message in MessageProcessor.
Index: HttpSender.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/HttpSender.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** HttpSender.java 9 Apr 2003 07:47:46 -0000 1.13
--- HttpSender.java 21 May 2003 14:07:12 -0000 1.14
***************
*** 142,154 ****
catch (TransportException te) {
// error already logged
}
catch (SOAPException e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_SOAP_CANNOT_CREATE_OBJECT, e,
! "synchronous response message"));
}
catch (Exception e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e));
}
--- 142,157 ----
catch (TransportException te) {
// error already logged
+ exceptionMessage = te.getMessage();
}
catch (SOAPException e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_SOAP_CANNOT_CREATE_OBJECT, e,
! "synchronous response message");
! logger.error(exceptionMessage);
}
catch (Exception e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
! logger.error(exceptionMessage);
}
Index: MailSender.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MailSender.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MailSender.java 9 Apr 2003 07:47:49 -0000 1.11
--- MailSender.java 21 May 2003 14:07:12 -0000 1.12
***************
*** 109,116 ****
catch (TransportException te) {
// error already logged
}
catch (Exception e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e));
}
--- 109,118 ----
catch (TransportException te) {
// error already logged
+ exceptionMessage = te.getMessage();
}
catch (Exception e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
! logger.error(exceptionMessage);
}
|
|
From: <cy...@us...> - 2003-05-21 14:06:25
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv2912
Modified Files:
Tag: b0931
HttpSender.java MailSender.java
Log Message:
Bug fix: exceptionMessage in parent class (MessageSender) should be set in
order to report the correct error message in MessageProcessor.
Index: HttpSender.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/HttpSender.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** HttpSender.java 9 Apr 2003 08:41:33 -0000 1.12.2.1
--- HttpSender.java 21 May 2003 14:06:20 -0000 1.12.2.2
***************
*** 142,154 ****
catch (TransportException te) {
// error already logged
}
catch (SOAPException e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_SOAP_CANNOT_CREATE_OBJECT, e,
! "synchronous response message"));
}
catch (Exception e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e));
}
--- 142,157 ----
catch (TransportException te) {
// error already logged
+ exceptionMessage = te.getMessage();
}
catch (SOAPException e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_SOAP_CANNOT_CREATE_OBJECT, e,
! "synchronous response message");
! logger.error(exceptionMessage);
}
catch (Exception e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
! logger.error(exceptionMessage);
}
Index: MailSender.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MailSender.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** MailSender.java 9 Apr 2003 08:41:33 -0000 1.10.2.1
--- MailSender.java 21 May 2003 14:06:21 -0000 1.10.2.2
***************
*** 109,116 ****
catch (TransportException te) {
// error already logged
}
catch (Exception e) {
! logger.error(ErrorMessages.getMessage(
! ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e));
}
--- 109,118 ----
catch (TransportException te) {
// error already logged
+ exceptionMessage = te.getMessage();
}
catch (Exception e) {
! exceptionMessage = ErrorMessages.getMessage
! (ErrorMessages.ERR_HERMES_UNKNOWN_ERROR, e);
! logger.error(exceptionMessage);
}
|
|
From: <kc...@us...> - 2003-05-21 08:15:53
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv10661/src/hk/hku/cecid/phoenix/message/handler
Modified Files:
MessageServiceHandler.java
Log Message:
compare trusted repository paths with canonical path
Index: MessageServiceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandler.java,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** MessageServiceHandler.java 20 May 2003 09:40:34 -0000 1.167
--- MessageServiceHandler.java 21 May 2003 08:12:20 -0000 1.168
***************
*** 784,788 ****
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! trustedListenerRepository.add(listenerDirs.nextToken());
}
}
--- 784,792 ----
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! try {
! File f = new File(listenerDirs.nextToken());
! trustedListenerRepository.add(f.getCanonicalPath());
! }
! catch (IOException e) {}
}
}
***************
*** 1506,1511 ****
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! boolean isServerRepository =
! trustedListenerRepository.contains(clientUrl.getPath());
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
--- 1510,1520 ----
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! File clientUrlFile = new File(clientUrl.getPath());
! boolean isServerRepository = false;
! try {
! isServerRepository = trustedListenerRepository.contains(
! clientUrlFile.getCanonicalPath());
! }
! catch (IOException e) {}
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
|
|
From: <kc...@us...> - 2003-05-21 08:12:55
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv10931/src/hk/hku/cecid/phoenix/message/handler
Modified Files:
Tag: b0931
Utility.java
Log Message:
update version number
Index: Utility.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Utility.java,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -C2 -d -r1.18.2.6 -r1.18.2.7
*** Utility.java 20 May 2003 07:31:59 -0000 1.18.2.6
--- Utility.java 21 May 2003 08:12:51 -0000 1.18.2.7
***************
*** 116,120 ****
* implementation.
*/
! private static final String RELEASE = "0.9.3.1-rc2";
/**
--- 116,120 ----
* implementation.
*/
! private static final String RELEASE = "0.9.3.1-rc3";
/**
|
|
From: <kc...@us...> - 2003-05-21 08:10:56
|
Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv9842/src/hk/hku/cecid/phoenix/message/handler
Modified Files:
Tag: b0931
MessageServiceHandler.java
Log Message:
compare trusted repository paths with canonical path
Index: MessageServiceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandler.java,v
retrieving revision 1.148.2.15
retrieving revision 1.148.2.16
diff -C2 -d -r1.148.2.15 -r1.148.2.16
*** MessageServiceHandler.java 20 May 2003 04:58:46 -0000 1.148.2.15
--- MessageServiceHandler.java 21 May 2003 08:10:53 -0000 1.148.2.16
***************
*** 785,789 ****
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! trustedListenerRepository.add(listenerDirs.nextToken());
}
}
--- 785,793 ----
(trustedRepo, DELIMITER);
while (listenerDirs.hasMoreTokens()) {
! try {
! File f = new File(listenerDirs.nextToken());
! trustedListenerRepository.add(f.getCanonicalPath());
! }
! catch (IOException e) {}
}
}
***************
*** 1497,1502 ****
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! boolean isServerRepository =
! trustedListenerRepository.contains(clientUrl.getPath());
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
--- 1501,1511 ----
// Not client message listener and it's not using trusted repository
if (clientUrl.getProtocol().equals(MessageListener.PROTOCOL_FILE)) {
! File clientUrlFile = new File(clientUrl.getPath());
! boolean isServerRepository = false;
! try {
! isServerRepository = trustedListenerRepository.contains(
! clientUrlFile.getCanonicalPath());
! }
! catch (IOException e) {}
boolean isClientRepository =
listener instanceof ClientMessageListenerImpl;
|
4 messages has been excluded from this view by a project administrator.
