[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/handler FilePersistenceHandler.java,1.2,1.3 MessageServiceHandler.java,1.181,1.182 Transaction.java,1.16,1.17

[<bob...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler
In directory sc8-pr-cvs1:/tmp/cvs-serv11896/src/hk/hku/cecid/phoenix/message/handler

Modified Files:
	FilePersistenceHandler.java MessageServiceHandler.java 
	Transaction.java 
Log Message:
Move the Test files out from b0931 and to folder without tag.
Add storePersistenceObject() function to Transaction.java

Index: FilePersistenceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/FilePersistenceHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilePersistenceHandler.java	3 Jan 2004 09:53:40 -0000	1.2
--- FilePersistenceHandler.java	5 Jan 2004 09:57:43 -0000	1.3
***************
*** 205,209 ****
          }
          if (file.exists() && !file.delete()) {
!             throw new PersistenceException("Object cannot be removed");
          }
      }
--- 205,210 ----
          }
          if (file.exists() && !file.delete()) {
!             file.deleteOnExit();
!             //throw new PersistenceException("Object cannot be removed");
          }
      }

Index: MessageServiceHandler.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/MessageServiceHandler.java,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** MessageServiceHandler.java	31 Dec 2003 04:06:42 -0000	1.181
--- MessageServiceHandler.java	5 Jan 2004 09:57:43 -0000	1.182
***************
*** 1005,1008 ****
--- 1005,1009 ----
              HttpSender.configure(prop);
              MailSender.configure(prop);
+             PersistenceManager.configure(prop);
  
              String className = prop.get(Constants.PROPERTY_CONFIG_LOCAL);

Index: Transaction.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/handler/Transaction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Transaction.java	11 Dec 2003 06:41:29 -0000	1.16
--- Transaction.java	5 Jan 2004 09:57:43 -0000	1.17
***************
*** 172,175 ****
--- 172,176 ----
      private final DbConnectionPool dbConnectionPool;
      private final ArrayList filenameList;
+     private final ArrayList persistenceList;
      private final ArrayList lockList;
      private final ArrayList threadList;
***************
*** 188,191 ****
--- 189,193 ----
          this.threadList = new ArrayList();
          this.deliveryRecordList = new ArrayList();
+         this.persistenceList = new ArrayList();
      }
  
***************
*** 274,277 ****
--- 276,284 ----
          lockList.add(id);
      }
+     
+     public void storePersistenceObject(String name,
+             PersistenceHandler handler) {
+         persistenceList.add(new PersistenceObject(handler, name));
+     }
  
      /** 
***************
*** 449,452 ****
--- 456,460 ----
                  filenameList.clear();
                  deliveryRecordList.clear();
+                 persistenceList.clear();
              }
          }
***************
*** 524,527 ****
--- 532,549 ----
          }
          filenameList.clear();
+         
+         // Delete the persistence objects
+         for (Iterator i=filenameList.iterator() ; i.hasNext() ; ) {
+             PersistenceObject obj = (PersistenceObject) i.next();
+             try {
+                 obj.getPersistenceHandler().removeObject(obj.getName());
+             } catch (PersistenceException e) {
+                 String err = ErrorMessages.getMessage(
+                         ErrorMessages.ERR_TX_CANNOT_ROLLBACK, e);
+                 logger.error(err);
+                 exception = new TransactionException(err);
+                 
+             }
+         }
  
          logger.debug("<= Transaction.rollback");
***************
*** 561,564 ****
--- 583,609 ----
                  throw new TransactionException(e.getMessage());
              }
+         }
+     }
+     
+     /**
+      * PersistenceObject is the class to store on the persistence list
+      * 
+      * @author pykoon
+      * @version $Revision$
+      */
+     private class PersistenceObject {
+         private PersistenceHandler handler;
+         private String name;
+         public PersistenceObject(PersistenceHandler handler, String name) {
+             this.name = name;
+             this.handler = handler;
+         }
+         
+         public PersistenceHandler getPersistenceHandler() {
+             return handler;
+         }
+         
+         public String getName() {
+             return name;
          }
      }