[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/handler MessageServer.java,1.136,1.137 MessageServiceHandlerConfig.java,1.14,1.15 Constants.java,1.27,1.28

[<kc...@us...>]

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>";
  }