[jboss-svn-commits] JBL Code SVN: r5392 - in labs/jbossesb/branches/refactor/product/core: common/src/org/jboss/soa/esb/notification services/src/META-INF services/src/org/jboss/soa/esb/internal/core/objectstore services/src/org/jboss/soa/esb/services services/src/org/jboss/soa/esb/services/EJB

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Aug 1 18:33:07 EDT 2006


Author: arvinder
Date: 2006-08-01 18:32:20 -0400 (Tue, 01 Aug 2006)
New Revision: 5392

Added:
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java
Removed:
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
Modified:
   labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java
   labs/jbossesb/branches/refactor/product/core/services/src/META-INF/ejb-jar.xml
   labs/jbossesb/branches/refactor/product/core/services/src/META-INF/jboss.xml
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
   labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
Log:
Remove JbossEsb prefix

Modified: labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/notification/NotificationList.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -27,13 +27,13 @@
 
 /**
  * Holds lists of NotificationTarget objects so that the
- * JbossEsbNotificationHandler EJB behaviour can be controlled at runtime by
+ * NotificationHandler EJB behaviour can be controlled at runtime by
  * client applications
  * <p>
  * Description: Objects of this class will hold a list of objects that extend
  * the NotificationTarget base class. It's main purpose is to allow Rosetta
  * users to configure lists of recipients of specific events, and request the
- * JbossEsbNotificationHandler EJB to take care of triggering the events to each
+ * NotificationHandler EJB to take care of triggering the events to each
  * object specified as a child "target" element
  * </p>
  * <p>

Modified: labs/jbossesb/branches/refactor/product/core/services/src/META-INF/ejb-jar.xml
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/META-INF/ejb-jar.xml	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/META-INF/ejb-jar.xml	2006-08-01 22:32:20 UTC (rev 5392)
@@ -11,16 +11,16 @@
 
       <!-- Session Beans -->
       <session >
-         <description><![CDATA[JbossEsbNotificationHandler]]></description>
+         <description><![CDATA[NotificationHandler]]></description>
          <display-name>Jboss_Esb_Notification_Handler</display-name>
 
-         <ejb-name>JbossEsbNotificationHandler</ejb-name>
+         <ejb-name>NotificationHandler</ejb-name>
 
-         <home>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerHome</home>
-         <remote>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandler</remote>
-         <local-home>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocalHome</local-home>
-         <local>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocal</local>
-         <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerBean</ejb-class>
+         <home>org.jboss.soa.esb.services.EJB.NotificationHandlerHome</home>
+         <remote>org.jboss.soa.esb.services.EJB.NotificationHandler</remote>
+         <local-home>org.jboss.soa.esb.services.EJB.NotificationHandlerLocalHome</local-home>
+         <local>org.jboss.soa.esb.services.EJB.NotificationHandlerLocal</local>
+         <ejb-class>org.jboss.soa.esb.services.EJB.NotificationHandlerBean</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Container</transaction-type>
 
@@ -30,13 +30,13 @@
          <description><![CDATA[]]></description>
          <display-name>Jboss_ESB_PERSIST_HANDLER</display-name>
 
-         <ejb-name>JbossEsbPersistHandler</ejb-name>
+         <ejb-name>PersistHandler</ejb-name>
 
-         <home>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerHome</home>
-         <remote>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandler</remote>
-         <local-home>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocalHome</local-home>
-         <local>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocal</local>
-         <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerBean</ejb-class>
+         <home>org.jboss.soa.esb.services.EJB.PersistHandlerHome</home>
+         <remote>org.jboss.soa.esb.services.EJB.PersistHandler</remote>
+         <local-home>org.jboss.soa.esb.services.EJB.PersistHandlerLocalHome</local-home>
+         <local>org.jboss.soa.esb.services.EJB.PersistHandlerLocal</local>
+         <ejb-class>org.jboss.soa.esb.services.EJB.PersistHandlerBean</ejb-class>
          <session-type>Stateless</session-type>
          <transaction-type>Bean</transaction-type>
 
@@ -46,13 +46,13 @@
          <description><![CDATA[]]></description>
          <display-name>Jboss_Esb_Batch_Handler</display-name>
 
-         <ejb-name>JbossEsbBatchHandler</ejb-name>
+         <ejb-name>BatchHandler</ejb-name>
 
-         <home>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerHome</home>
-         <remote>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandler</remote>
-         <local-home>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocalHome</local-home>
-         <local>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocal</local>
-         <ejb-class>org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerBean</ejb-class>
+         <home>org.jboss.soa.esb.services.EJB.BatchHandlerHome</home>
+         <remote>org.jboss.soa.esb.services.EJB.BatchHandler</remote>
+         <local-home>org.jboss.soa.esb.services.EJB.BatchHandlerLocalHome</local-home>
+         <local>org.jboss.soa.esb.services.EJB.BatchHandlerLocal</local>
+         <ejb-class>org.jboss.soa.esb.services.EJB.BatchHandlerBean</ejb-class>
          <session-type>Stateful</session-type>
          <transaction-type>Bean</transaction-type>
 
@@ -108,7 +108,7 @@
      -->
    <container-transaction >
       <method >
-         <ejb-name>JbossEsbNotificationHandler</ejb-name>
+         <ejb-name>NotificationHandler</ejb-name>
           <method-name>*</method-name>
        </method>
        <trans-attribute>Required</trans-attribute>

Modified: labs/jbossesb/branches/refactor/product/core/services/src/META-INF/jboss.xml
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/META-INF/jboss.xml	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/META-INF/jboss.xml	2006-08-01 22:32:20 UTC (rev 5392)
@@ -13,25 +13,25 @@
      -->
 
       <session>
-         <ejb-name>JbossEsbNotificationHandler</ejb-name>
-         <jndi-name>JbossEsbNotificationHandler</jndi-name>
-         <local-jndi-name>JbossEsbNotificationHandlerLocal</local-jndi-name>
+         <ejb-name>NotificationHandler</ejb-name>
+         <jndi-name>NotificationHandler</jndi-name>
+         <local-jndi-name>NotificationHandlerLocal</local-jndi-name>
 
         <method-attributes>
         </method-attributes>
       </session>
       <session>
-         <ejb-name>JbossEsbPersistHandler</ejb-name>
-         <jndi-name>JbossEsbPersistHandler</jndi-name>
-         <local-jndi-name>JbossEsbPersistHandlerLocal</local-jndi-name>
+         <ejb-name>PersistHandler</ejb-name>
+         <jndi-name>PersistHandler</jndi-name>
+         <local-jndi-name>PersistHandlerLocal</local-jndi-name>
 
         <method-attributes>
         </method-attributes>
       </session>
       <session>
-         <ejb-name>JbossEsbBatchHandler</ejb-name>
-         <jndi-name>JbossEsbBatchHandler</jndi-name>
-         <local-jndi-name>JbossEsbBatchHandlerLocal</local-jndi-name>
+         <ejb-name>BatchHandler</ejb-name>
+         <jndi-name>BatchHandler</jndi-name>
+         <local-jndi-name>BatchHandlerLocal</local-jndi-name>
 
         <method-attributes>
         </method-attributes>

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -239,7 +239,7 @@
 	 * @param p_sClassName
 	 *            Class to search for in descriptor table
 	 * @return BobjStore - A descriptor that will provide persistence info
-	 * @see JbossEsbPersistHandler
+	 * @see PersistHandler
 	 * @see BobjStore#getStore(BusinessObject)
 	 */
 	public static BobjStore getStore(String p_sClassName) {
@@ -255,7 +255,7 @@
 	 * @param p_sClassName
 	 *            BobjStdDTO for which we need an object store
 	 * @return BobjStore - A descriptor that will provide persistence info
-	 * @see JbossEsbPersistHandler
+	 * @see PersistHandler
 	 * @see BobjStore#getStore(String)
 	 */
 	public static BobjStore getStore(BobjStdDTO p_oDto) {

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -85,7 +85,7 @@
   /**
    * Column index for the SQL table field representing snapshot's unique identifier
    * <p>This would be the 'natural' primary key for all snapshot tables, and the
-   * number should only be assigned by the JbossEsbPersistHandler EJB at insert time</p>
+   * number should only be assigned by the PersistHandler EJB at insert time</p>
    * <p>There could potentially be several snapshots for the same
    * BusinessObject - In that case, there would be several rows in the
    * snapshot table with the same OBJECT_UID value and different UID_SNAP
@@ -124,7 +124,7 @@
    * Column index for the SQL table field representing the batch number
    * as a result of which this snapshot was added to the store
    * <p>If this snapshot was not added as part of a batch process (meaning a
-   * group of BusinessObjects added using the JbossEsbBatchHandler EJB), then it
+   * group of BusinessObjects added using the BatchHandler EJB), then it
    * will hold a null value</p>
    */
   public static final int  BATCH_NUM     = s_iFld++;

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -183,7 +183,7 @@
   /**
    * This is an exception to the standard behaviour of derived classes that
    * extend the SqlDbTable abstract class
-   * <p>This method is called by the JbossEsbPersistHandler and JbossEsbBatchHandler EJBs
+   * <p>This method is called by the PersistHandler and BatchHandler EJBs
    * and makes their life easier when they need to obtain UID chunks</p>
    * <p>These EJBs rely on this table to ensure no duplicate UIDs across all of
    * Rosetta</p>

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -30,13 +30,13 @@
 
 public class BatchHandlerBsDelegateLocal implements IbatchHandler
 {
-  private  JbossEsbBatchHandlerLocal    m_oBatchH;
+  private  BatchHandlerLocal    m_oBatchH;
 
   public BatchHandlerBsDelegateLocal(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbBatchHandlerLocal");
+    Object ref = p_ctx.lookup("BatchHandlerLocal");
 
-    JbossEsbBatchHandlerLocalHome oHu = (JbossEsbBatchHandlerLocalHome) ref;
+    BatchHandlerLocalHome oHu = (BatchHandlerLocalHome) ref;
     m_oBatchH = oHu.create();
   } //__________________________________
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/BatchHandlerBsDelegateRemote.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -31,13 +31,13 @@
 
 public class BatchHandlerBsDelegateRemote implements IbatchHandler
 {
-  private  JbossEsbBatchHandler    m_oBatchH;
+  private  BatchHandler    m_oBatchH;
 
   public BatchHandlerBsDelegateRemote(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbBatchHandler");
-    Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbBatchHandlerHome.class);
-    JbossEsbBatchHandlerHome oHu = (JbossEsbBatchHandlerHome) oNarr;
+    Object ref = p_ctx.lookup("BatchHandler");
+    Object oNarr = PortableRemoteObject.narrow(ref, BatchHandlerHome.class);
+    BatchHandlerHome oHu = (BatchHandlerHome) oNarr;
     m_oBatchH = oHu.create();
   } //__________________________________
 

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,32 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Remote interface for BatchHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface BatchHandler
+   extends javax.ejb.EJBObject
+{
+
+   public long newBatch(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public long getBatchNum(  )
+      throws java.rmi.RemoteException;
+
+   public int addToBatch( java.lang.String p_s )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void finish(  )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,318 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+
+
+package org.jboss.soa.esb.services.EJB;
+
+import java.sql.*;
+import java.text.*;
+import javax.ejb.*;
+import javax.naming.*;
+import javax.sql.*;
+
+import org.apache.log4j.*;
+import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.helpers.persist.*;
+import org.jboss.soa.esb.internal.core.objectstore.*;
+import org.jboss.soa.esb.common.bizclasses.*;
+/**
+ * @ejb.bean
+ * 		name="BatchHandler"
+ * 		display-name="Jboss_Esb_Batch_Handler"
+ * 		type="Stateful"
+ * 		view-type="both"
+ * 		jndi-name="BatchHandler"
+ * 		local-jndi-name="BatchHandlerLocal"
+ * 		transaction-type="Bean"
+ * @author
+ */
+public class  BatchHandlerBean implements SessionBean
+{
+  private static final long serialVersionUID = 1L;
+  SessionContext m_oSessCtx;
+
+  public void setSessionContext(SessionContext p_oSessCtx)
+  { this.m_oSessCtx = p_oSessCtx; }
+
+  private Logger                m_oLogger;
+  private JdbcCleanConn         m_oUidConn;
+  private JdbcCleanConn         m_oDataConn;
+
+  private DaoUidTable           m_oDaoUid;
+  private DaoBatchTable         m_oDaoBatch;
+  private DaoIndexTable         m_oDaoIndex;
+  private DaoSnapTable          m_oDaoSnap;
+
+  private long                  m_lBatchNum = -1;
+  private int                   m_iSeq;
+
+/**
+ * @ejb.create-method
+ * @throws CreateException
+ */
+  public void ejbCreate() throws CreateException
+  {
+    try
+    { getResources();
+      m_oLogger.info(this.toString()+" Created");
+    }
+    catch (Exception e)
+    { m_oLogger.error("Failed to Create : <"+e.getMessage()+">");
+      throw new CreateException(e.getMessage());
+    }
+  } //__________________________________
+
+  public void ejbActivate()
+  { try
+    { getResources();
+      m_oLogger.info("EJB Activated");
+    }
+    catch (Exception e)
+    { m_oLogger.error("Failed to Activate : <"+e.getMessage()+">");
+    }
+  } //__________________________________
+
+  public void ejbPassivate()
+  { m_oLogger.info("EJB Passivated");
+    releaseResources();
+    m_oLogger   = null;
+    m_oUidConn  = null;
+    m_oDataConn = null;
+  } //__________________________________
+
+  public void ejbRemove()
+  { releaseResources();
+    m_oLogger.info("EJB Removed");
+  } //__________________________________
+
+  private void getResources() throws Exception
+  { Context oCtx = new InitialContext();
+    m_oLogger  = EsbUtil.getDefaultLogger(this.getClass());
+    m_oUidConn  = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
+    m_oDataConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
+  } //__________________________________
+
+  private void releaseResources()
+  { if (null != m_oDataConn)  m_oDataConn.release();
+    if (null != m_oUidConn)   m_oUidConn.release();
+    m_oDaoBatch = null;
+    m_oDaoUid   = null;
+    m_oDaoIndex = null;
+    m_oDaoSnap  = null;
+  } //__________________________________
+
+//  Utility Methods
+
+  private DaoUidTable getDaoUid() throws Exception
+  { if (null==m_oDaoUid) 
+	  m_oDaoUid = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
+    return m_oDaoUid;
+  } //__________________________________
+
+  private DaoBatchTable getDaoBatch(String p_sTbl) throws Exception
+  { if (null==m_oDaoBatch)
+      m_oDaoBatch = new DaoBatchTable(m_oDataConn,p_sTbl);
+    return m_oDaoBatch;
+  } //__________________________________
+
+  private DaoIndexTable getDaoIndex(String p_sTbl) throws Exception
+  { if (null==m_oDaoIndex)
+      m_oDaoIndex = new DaoIndexTable(m_oDataConn,p_sTbl);
+    return m_oDaoIndex;
+  } //__________________________________
+
+  private DaoSnapTable getDaoSnap(BobjStore p_o) throws Exception
+  { if (null==m_oDaoSnap)
+      m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_o);
+    return m_oDaoSnap;
+  } //__________________________________
+
+  private void doCommitBatch(BatchProcess p_oBP) throws Exception
+  { String sPrevClass = null;
+    BobjStore oStore = null;
+
+    PreparedStatement PSbatch = getDaoBatch(BobjStore.getBatchTableName())
+        .getPS(DaoBatchTable.PS_GET_BATCH_ROWS);
+    PSbatch.setLong(1,p_oBP.getBatchNum());
+
+    long lNow = System.currentTimeMillis();
+    String sSnapDt = new SimpleDateFormat("yyyyMMdd").format(new Date(lNow));
+
+    //  Get all Batch rows
+    ResultSet RS = m_oDataConn.execQueryWait(PSbatch,10);
+    while (RS.next())
+    { String sXml = RS.getString(1+DaoBatchTable.STR_DATA);
+      BobjStdDTO oDto = BobjStdDTO.getFromXml(sXml);
+      //  Get proper Dao's for Index and Snap table
+      String sNewClass = oDto.fullClassName(); 
+      if (! sNewClass.equals(sPrevClass))
+      { oStore      = BobjStore.getStore(sNewClass);
+        sPrevClass	= sNewClass;
+        m_oDaoIndex = null;
+        m_oDaoSnap  = null;
+      }
+      // Set batch number to current batch
+      oDto.setBatch	(p_oBP.getBatchNum());
+      oDto.setStamp (lNow);
+      oDto.setSnapDate(sSnapDt);
+
+      // Insert Snap row
+      PreparedStatement PSins = getDaoSnap(oStore).getPS(DaoSnapTable.PS_INS_SNAP);
+      m_oDaoSnap.setInsValues(PSins,oDto);
+      try { m_oDataConn.execUpdWait(PSins,10); }
+      catch (Exception e) { m_oLogger.error(e.getMessage()); }
+
+      // Insert row in all index tables
+      String[][] saa = oDto.getLocators();
+      for (int i1=0; i1<saa.length; i1++)
+      {	m_oDaoIndex = getDaoIndex(oStore.getLocatorTable(i1)); 
+    	PSins = m_oDaoIndex.getPS(DaoIndexTable.PS_INS_INDEX);
+    	m_oDaoIndex.setInsValues(PSins,oDto,i1);
+    	try { m_oDataConn.execUpdWait(PSins,10); }
+    	catch (Exception e) { m_oLogger.error(e.getMessage()); }
+      }
+    }
+    PSbatch.close();
+
+    // Delete batch rows we just used
+    PreparedStatement PSdel = getDaoBatch(BobjStore.getBatchTableName())
+        .getPS(DaoBatchTable.PS_DELETE_BATCH);
+    PSdel.setLong(1,p_oBP.getBatchNum());
+    m_oDataConn.execUpdWait(PSdel,10);
+
+    p_oBP.setField	(BatchProcess.ATTRIB.commitStamp,Long.toString(lNow));
+    p_oBP.setStamp 	(lNow);
+    p_oBP.setSnapDate(sSnapDt);
+
+    oStore  = BobjStore.getStore(BatchProcess.class.getName());
+
+    // Update snap table with proper timestamp
+    m_oDaoSnap  = null;
+    PreparedStatement PSupd = getDaoSnap(oStore).getPS(DaoSnapTable.PS_UPD_SNAP);
+    getDaoSnap(oStore).setUpdValues(PSupd,p_oBP);
+    m_oDataConn.execUpdWait(PSupd,10);
+
+    // Update index table with proper timestamp
+    m_oDaoIndex = null;
+    PSupd = getDaoIndex(oStore.getLocatorTable()).getPS(DaoIndexTable.PS_UPD_INDEX);
+    getDaoIndex(oStore.getLocatorTable()).setUpdValues(PSupd,p_oBP);
+    m_oDataConn.execUpdWait(PSupd,10);
+
+  } //__________________________________
+
+//______________________________________________________________________________
+// Public local and remote interface methods
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ */
+  public long newBatch() throws Exception
+  { if (m_lBatchNum > 0) throw
+        new Exception ("Must finish with previous batch before opening new");
+    m_iSeq  = 0;
+    try
+    { return m_lBatchNum = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_BATCH, 1);
+    }
+    catch (Exception e)
+    { m_oLogger.error("BatchHandlerBean.newBatch() FAILED "+ e.getMessage());
+      throw e;
+    }
+    finally   { releaseResources(); }
+  } //__________________________________
+
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * @return
+ */
+  public long getBatchNum()
+  { return m_lBatchNum;
+  } //__________________________________
+
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * @param p_s
+ * @return
+ * @throws Exception
+ */
+  public int addToBatch(String p_s) throws Exception
+  { if (null==p_s) throw
+      new Exception ("Tryng to add a null String to a batch");
+    if (m_lBatchNum < 1) throw
+        new Exception ("Must request batch number before adding objects");
+    try
+    { RowBatch oRow = new RowBatch(m_lBatchNum,++m_iSeq,0,p_s);
+      getDaoBatch(BobjStore.getBatchTableName());
+      PreparedStatement PS = m_oDaoBatch.getPS(DaoBatchTable.PS_INS_BATCHROW);
+      m_oDaoBatch.setInsValues(PS,oRow);
+      m_oDataConn.execUpdWait(PS,1);
+      m_oDataConn.commit();
+      return m_iSeq;
+    }
+    catch (Exception e)
+    { if (null != m_oDataConn) m_oDataConn.rollback();
+      m_oLogger.error("addToBatch() failed",e);
+      throw e;
+    }
+    finally { releaseResources(); }
+  } //__________________________________
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * @throws Exception
+ */
+  public void finish() throws Exception
+  { if (m_lBatchNum < 1) return;
+    m_lBatchNum = -1;
+    m_iSeq  = 0;
+  } //__________________________________
+
+//______________________________________________________________________________
+// Public local interface methods
+
+/**
+ * @ejb.interface-method
+ * 		view-type="local"
+ */
+  public void commitBatch(BatchProcess p_oBO) throws Exception
+  { try { doCommitBatch(p_oBO); m_oDataConn.commit(); }
+    catch (Exception e)
+    { if (null != m_oDataConn) m_oDataConn.rollback();
+      m_oLogger.error("commitBatch(BatchProcess) FAILED ",e);
+      throw e;
+    }
+    finally { releaseResources(); }
+  } //__________________________________
+
+//______________________________________________________________________________
+// Public remote interface methods
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ */
+  public void commitBatch(BobjStdDTO p_oDto) throws Exception
+  { commitBatch (new BatchProcess(p_oDto));
+  } //__________________________________
+
+} //____________________________________________________________________________

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Home interface for BatchHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface BatchHandlerHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/BatchHandler";
+   public static final String JNDI_NAME="BatchHandler";
+
+   public org.jboss.soa.esb.services.EJB.BatchHandler create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,29 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Local interface for BatchHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface BatchHandlerLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public long newBatch(  ) throws java.lang.Exception;
+
+   public long getBatchNum(  ) ;
+
+   public int addToBatch( java.lang.String p_s ) throws java.lang.Exception;
+
+   public void finish(  ) throws java.lang.Exception;
+
+   public void commitBatch( org.jboss.soa.esb.common.bizclasses.BatchProcess p_oBO ) throws java.lang.Exception;
+
+   public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Local home interface for BatchHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface BatchHandlerLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/BatchHandlerLocal";
+   public static final String JNDI_NAME="BatchHandlerLocal";
+
+   public org.jboss.soa.esb.services.EJB.BatchHandlerLocal create()
+      throws javax.ejb.CreateException;
+
+}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,32 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Remote interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandler
-   extends javax.ejb.EJBObject
-{
-
-   public long newBatch(  )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public long getBatchNum(  )
-      throws java.rmi.RemoteException;
-
-   public int addToBatch( java.lang.String p_s )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public void finish(  )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,318 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import java.sql.*;
-import java.text.*;
-import javax.ejb.*;
-import javax.naming.*;
-import javax.sql.*;
-
-import org.apache.log4j.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
-import org.jboss.soa.esb.common.bizclasses.*;
-/**
- * @ejb.bean
- * 		name="JbossEsbBatchHandler"
- * 		display-name="Jboss_Esb_Batch_Handler"
- * 		type="Stateful"
- * 		view-type="both"
- * 		jndi-name="JbossEsbBatchHandler"
- * 		local-jndi-name="JbossEsbBatchHandlerLocal"
- * 		transaction-type="Bean"
- * @author
- */
-public class  JbossEsbBatchHandlerBean implements SessionBean
-{
-  private static final long serialVersionUID = 1L;
-  SessionContext m_oSessCtx;
-
-  public void setSessionContext(SessionContext p_oSessCtx)
-  { this.m_oSessCtx = p_oSessCtx; }
-
-  private Logger                m_oLogger;
-  private JdbcCleanConn         m_oUidConn;
-  private JdbcCleanConn         m_oDataConn;
-
-  private DaoUidTable           m_oDaoUid;
-  private DaoBatchTable         m_oDaoBatch;
-  private DaoIndexTable         m_oDaoIndex;
-  private DaoSnapTable          m_oDaoSnap;
-
-  private long                  m_lBatchNum = -1;
-  private int                   m_iSeq;
-
-/**
- * @ejb.create-method
- * @throws CreateException
- */
-  public void ejbCreate() throws CreateException
-  {
-    try
-    { getResources();
-      m_oLogger.info(this.toString()+" Created");
-    }
-    catch (Exception e)
-    { m_oLogger.error("Failed to Create : <"+e.getMessage()+">");
-      throw new CreateException(e.getMessage());
-    }
-  } //__________________________________
-
-  public void ejbActivate()
-  { try
-    { getResources();
-      m_oLogger.info("EJB Activated");
-    }
-    catch (Exception e)
-    { m_oLogger.error("Failed to Activate : <"+e.getMessage()+">");
-    }
-  } //__________________________________
-
-  public void ejbPassivate()
-  { m_oLogger.info("EJB Passivated");
-    releaseResources();
-    m_oLogger   = null;
-    m_oUidConn  = null;
-    m_oDataConn = null;
-  } //__________________________________
-
-  public void ejbRemove()
-  { releaseResources();
-    m_oLogger.info("EJB Removed");
-  } //__________________________________
-
-  private void getResources() throws Exception
-  { Context oCtx = new InitialContext();
-    m_oLogger  = EsbUtil.getDefaultLogger(this.getClass());
-    m_oUidConn  = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
-    m_oDataConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
-  } //__________________________________
-
-  private void releaseResources()
-  { if (null != m_oDataConn)  m_oDataConn.release();
-    if (null != m_oUidConn)   m_oUidConn.release();
-    m_oDaoBatch = null;
-    m_oDaoUid   = null;
-    m_oDaoIndex = null;
-    m_oDaoSnap  = null;
-  } //__________________________________
-
-//  Utility Methods
-
-  private DaoUidTable getDaoUid() throws Exception
-  { if (null==m_oDaoUid) 
-	  m_oDaoUid = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
-    return m_oDaoUid;
-  } //__________________________________
-
-  private DaoBatchTable getDaoBatch(String p_sTbl) throws Exception
-  { if (null==m_oDaoBatch)
-      m_oDaoBatch = new DaoBatchTable(m_oDataConn,p_sTbl);
-    return m_oDaoBatch;
-  } //__________________________________
-
-  private DaoIndexTable getDaoIndex(String p_sTbl) throws Exception
-  { if (null==m_oDaoIndex)
-      m_oDaoIndex = new DaoIndexTable(m_oDataConn,p_sTbl);
-    return m_oDaoIndex;
-  } //__________________________________
-
-  private DaoSnapTable getDaoSnap(BobjStore p_o) throws Exception
-  { if (null==m_oDaoSnap)
-      m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_o);
-    return m_oDaoSnap;
-  } //__________________________________
-
-  private void doCommitBatch(BatchProcess p_oBP) throws Exception
-  { String sPrevClass = null;
-    BobjStore oStore = null;
-
-    PreparedStatement PSbatch = getDaoBatch(BobjStore.getBatchTableName())
-        .getPS(DaoBatchTable.PS_GET_BATCH_ROWS);
-    PSbatch.setLong(1,p_oBP.getBatchNum());
-
-    long lNow = System.currentTimeMillis();
-    String sSnapDt = new SimpleDateFormat("yyyyMMdd").format(new Date(lNow));
-
-    //  Get all Batch rows
-    ResultSet RS = m_oDataConn.execQueryWait(PSbatch,10);
-    while (RS.next())
-    { String sXml = RS.getString(1+DaoBatchTable.STR_DATA);
-      BobjStdDTO oDto = BobjStdDTO.getFromXml(sXml);
-      //  Get proper Dao's for Index and Snap table
-      String sNewClass = oDto.fullClassName(); 
-      if (! sNewClass.equals(sPrevClass))
-      { oStore      = BobjStore.getStore(sNewClass);
-        sPrevClass	= sNewClass;
-        m_oDaoIndex = null;
-        m_oDaoSnap  = null;
-      }
-      // Set batch number to current batch
-      oDto.setBatch	(p_oBP.getBatchNum());
-      oDto.setStamp (lNow);
-      oDto.setSnapDate(sSnapDt);
-
-      // Insert Snap row
-      PreparedStatement PSins = getDaoSnap(oStore).getPS(DaoSnapTable.PS_INS_SNAP);
-      m_oDaoSnap.setInsValues(PSins,oDto);
-      try { m_oDataConn.execUpdWait(PSins,10); }
-      catch (Exception e) { m_oLogger.error(e.getMessage()); }
-
-      // Insert row in all index tables
-      String[][] saa = oDto.getLocators();
-      for (int i1=0; i1<saa.length; i1++)
-      {	m_oDaoIndex = getDaoIndex(oStore.getLocatorTable(i1)); 
-    	PSins = m_oDaoIndex.getPS(DaoIndexTable.PS_INS_INDEX);
-    	m_oDaoIndex.setInsValues(PSins,oDto,i1);
-    	try { m_oDataConn.execUpdWait(PSins,10); }
-    	catch (Exception e) { m_oLogger.error(e.getMessage()); }
-      }
-    }
-    PSbatch.close();
-
-    // Delete batch rows we just used
-    PreparedStatement PSdel = getDaoBatch(BobjStore.getBatchTableName())
-        .getPS(DaoBatchTable.PS_DELETE_BATCH);
-    PSdel.setLong(1,p_oBP.getBatchNum());
-    m_oDataConn.execUpdWait(PSdel,10);
-
-    p_oBP.setField	(BatchProcess.ATTRIB.commitStamp,Long.toString(lNow));
-    p_oBP.setStamp 	(lNow);
-    p_oBP.setSnapDate(sSnapDt);
-
-    oStore  = BobjStore.getStore(BatchProcess.class.getName());
-
-    // Update snap table with proper timestamp
-    m_oDaoSnap  = null;
-    PreparedStatement PSupd = getDaoSnap(oStore).getPS(DaoSnapTable.PS_UPD_SNAP);
-    getDaoSnap(oStore).setUpdValues(PSupd,p_oBP);
-    m_oDataConn.execUpdWait(PSupd,10);
-
-    // Update index table with proper timestamp
-    m_oDaoIndex = null;
-    PSupd = getDaoIndex(oStore.getLocatorTable()).getPS(DaoIndexTable.PS_UPD_INDEX);
-    getDaoIndex(oStore.getLocatorTable()).setUpdValues(PSupd,p_oBP);
-    m_oDataConn.execUpdWait(PSupd,10);
-
-  } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
-/**
- * @ejb.interface-method
- * 		view-type="both"
- */
-  public long newBatch() throws Exception
-  { if (m_lBatchNum > 0) throw
-        new Exception ("Must finish with previous batch before opening new");
-    m_iSeq  = 0;
-    try
-    { return m_lBatchNum = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_BATCH, 1);
-    }
-    catch (Exception e)
-    { m_oLogger.error("BatchHandlerBean.newBatch() FAILED "+ e.getMessage());
-      throw e;
-    }
-    finally   { releaseResources(); }
-  } //__________________________________
-
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * @return
- */
-  public long getBatchNum()
-  { return m_lBatchNum;
-  } //__________________________________
-
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * @param p_s
- * @return
- * @throws Exception
- */
-  public int addToBatch(String p_s) throws Exception
-  { if (null==p_s) throw
-      new Exception ("Tryng to add a null String to a batch");
-    if (m_lBatchNum < 1) throw
-        new Exception ("Must request batch number before adding objects");
-    try
-    { RowBatch oRow = new RowBatch(m_lBatchNum,++m_iSeq,0,p_s);
-      getDaoBatch(BobjStore.getBatchTableName());
-      PreparedStatement PS = m_oDaoBatch.getPS(DaoBatchTable.PS_INS_BATCHROW);
-      m_oDaoBatch.setInsValues(PS,oRow);
-      m_oDataConn.execUpdWait(PS,1);
-      m_oDataConn.commit();
-      return m_iSeq;
-    }
-    catch (Exception e)
-    { if (null != m_oDataConn) m_oDataConn.rollback();
-      m_oLogger.error("addToBatch() failed",e);
-      throw e;
-    }
-    finally { releaseResources(); }
-  } //__________________________________
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * @throws Exception
- */
-  public void finish() throws Exception
-  { if (m_lBatchNum < 1) return;
-    m_lBatchNum = -1;
-    m_iSeq  = 0;
-  } //__________________________________
-
-//______________________________________________________________________________
-// Public local interface methods
-
-/**
- * @ejb.interface-method
- * 		view-type="local"
- */
-  public void commitBatch(BatchProcess p_oBO) throws Exception
-  { try { doCommitBatch(p_oBO); m_oDataConn.commit(); }
-    catch (Exception e)
-    { if (null != m_oDataConn) m_oDataConn.rollback();
-      m_oLogger.error("commitBatch(BatchProcess) FAILED ",e);
-      throw e;
-    }
-    finally { releaseResources(); }
-  } //__________________________________
-
-//______________________________________________________________________________
-// Public remote interface methods
-/**
- * @ejb.interface-method
- * 		view-type="both"
- */
-  public void commitBatch(BobjStdDTO p_oDto) throws Exception
-  { commitBatch (new BatchProcess(p_oDto));
-  } //__________________________________
-
-} //____________________________________________________________________________

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerHome
-   extends javax.ejb.EJBHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbBatchHandler";
-   public static final String JNDI_NAME="JbossEsbBatchHandler";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbBatchHandler create()
-      throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,29 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerLocal
-   extends javax.ejb.EJBLocalObject
-{
-
-   public long newBatch(  ) throws java.lang.Exception;
-
-   public long getBatchNum(  ) ;
-
-   public int addToBatch( java.lang.String p_s ) throws java.lang.Exception;
-
-   public void finish(  ) throws java.lang.Exception;
-
-   public void commitBatch( org.jboss.soa.esb.common.bizclasses.BatchProcess p_oBO ) throws java.lang.Exception;
-
-   public void commitBatch( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbBatchHandlerLocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbBatchHandlerLocal";
-   public static final String JNDI_NAME="JbossEsbBatchHandlerLocal";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbBatchHandlerLocal create()
-      throws javax.ejb.CreateException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-
-/**
- * Remote interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandler
-   extends javax.ejb.EJBObject
-{
-
-   public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,119 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-import javax.ejb.*;
-import javax.naming.*;
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.notification.*;
-
-import org.apache.log4j.*;
-/**
- * @ejb.bean description="JbossEsbNotificationHandler"
- *           display-name="Jboss_Esb_Notification_Handler"
- *           jndi-name="JbossEsbNotificationHandler"
- * 			 local-jndi-name="JbossEsbNotificationHandlerLocal"
- *           name="JbossEsbNotificationHandler"
- *           type="Stateless"
- *           view-type="both"
- * 			 transaction-type="Container"
- * @ejb.transaction type="Required"
- * @author
- */
-public class JbossEsbNotificationHandlerBean implements SessionBean
-{
-  private static final long serialVersionUID = 1L;
-  private Logger        m_oLogger;
-  SessionContext        m_ctxSess;
-
-  public void ejbActivate()   {}
-  public void ejbPassivate()  {}
-  public void setSessionContext(SessionContext sessionContext)
-    { m_ctxSess = sessionContext; }
-/**
- * @ejb.create-method
- * @throws CreateException
- */
-  public void ejbCreate() throws CreateException
-  { try
-    { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
-//      Context oCtxInit   =
-    	  new InitialContext();
-
-      m_oLogger.info(this.toString()+" Created");
-    }
-    catch (Exception e)
-    { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
-      throw new CreateException(e.getMessage());
-    }
-  } //__________________________________
-
-  public void ejbRemove()
-  { m_oLogger.info(this.toString()+" Removed");
-  } //__________________________________
-
-//  Utility Methods
-
-  protected void releaseResources()
-  {
-  } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
-
-  private static final String s_sDfltList =
-      "<NotificationList  type=\"Error\" >"
-        +" <target"
-        +" class       = \"NotifyEmail\""
-        +" from        = \"JbossEsbDefault at myOrg.com\""
-        +" sendTo      = \"\""
-        +" subject     = \"Default JBoss ESB Notification\""
-        +" message     = \" Message from JBoss ESB :\""
-        +" />"
-    +" </NotificationList>"
-    ;
-  private static NotificationList s_dfltList;
-  static
-  { try
-    { s_dfltList = new NotificationList(DomElement.fromXml(s_sDfltList)); }
-    catch (Exception e) { e.printStackTrace(System.out); }
-  }
-/**
- * @ejb.interface-method
- * @param p_sParams
- * @param p_sMsg
- * @throws Exception
- */
-  public void sendNotifications(String p_sParams, Serializable p_oMsg)
-    throws Exception
-  {
-	DomElement oP = (null==p_sParams)?null:DomElement.fromXml(p_sParams);
-    NotificationList m_oL = (null==oP) ? s_dfltList : new NotificationList(oP);
-    m_oL.sendNotification(p_oMsg);
-  } //__________________________________
-
-} //____________________________________________________________________________

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerHome
-   extends javax.ejb.EJBHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbNotificationHandler";
-   public static final String JNDI_NAME="JbossEsbNotificationHandler";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandler create()
-      throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,21 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-import java.io.Serializable;
-
-/**
- * Local interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 5 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerLocal
-   extends javax.ejb.EJBLocalObject
-{
-
-   public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg ) throws java.lang.Exception;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 27 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbNotificationHandlerLocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbNotificationHandlerLocal";
-   public static final String JNDI_NAME="JbossEsbNotificationHandlerLocal";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbNotificationHandlerLocal create()
-      throws javax.ejb.CreateException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,32 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Remote interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandler
-   extends javax.ejb.EJBObject
-{
-
-   public long getUidChunk( int p_iQ )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public void rmvObject( java.lang.String p_sClassName,long p_lUid )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-   public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
-      throws java.lang.Exception, java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,367 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-
-
-
-package org.jboss.soa.esb.services.EJB;
-
-import javax.ejb.*;
-import javax.naming.*;
-import java.sql.*;
-import javax.sql.*;
-
-import java.text.*;
-import java.io.*;
-
-import org.jboss.soa.esb.util.*;
-import org.jboss.soa.esb.helpers.persist.*;
-import org.jboss.soa.esb.internal.core.objectstore.*;
-
-import org.apache.log4j.*;
-
-/**
- * @ejb.bean
- * name="JbossEsbPersistHandler"
- * display-name="Jboss_ESB_PERSIST_HANDLER"
- * type="Stateless"
- * view-type="both"
- * jndi-name="JbossEsbPersistHandler"
- * local-jndi-name="JbossEsbPersistHandlerLocal"
- * transaction-type="Bean"
- * @author Esteban
- */
-public class JbossEsbPersistHandlerBean implements SessionBean
-{
-  private static final long serialVersionUID = 1L;
-  private Logger        m_oLogger;
-  SessionContext        m_ctxSess;
-
-  private JdbcCleanConn m_oUidConn;
-  private JdbcCleanConn m_oDataConn;
-
-  private static final int s_iChunkSize=100;
-  private long          m_lUid;
-  private int           m_iChunkLeft=0;
-
-  private DaoUidTable   m_oDaoUid;
-  private DaoSnapTable  m_oDaoSnap;
-  private DaoIndexTable[] m_oaDaoIndex;
-
-  public void ejbActivate()   {}
-  public void ejbPassivate()  {}
-  public void setSessionContext(SessionContext sessionContext)
-    { m_ctxSess = sessionContext; }
-/**
- * @ejb.create-method
- * @throws CreateException
- */
-  public void ejbCreate() throws CreateException
-  { try
-    { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
-      Context oCtxInit   = new InitialContext();
-      String sDSjndiName = BobjStore.getDataSourceJndi();
-      DataSource oDS = (DataSource)oCtxInit.lookup(sDSjndiName);
-      m_oUidConn  = new JdbcCleanConn(oDS);
-      m_oDataConn = new JdbcCleanConn(oDS);
-
-      Class oCls = Class.forName("org.jboss.soa.esb.util.BobjStdDTO");
-      ObjectStreamClass XX = ObjectStreamClass.lookup(oCls);
-      System.out.println(XX.getSerialVersionUID());
-      System.out.println(oCls.getProtectionDomain().getCodeSource().getLocation());
-
-      m_oLogger.info(this.toString()+" Created");
-    }
-    catch (Exception e)
-    { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
-      throw new CreateException(e.getMessage());
-    }
-  } //__________________________________
-
-  public void ejbRemove()
-  { m_oLogger.info(this.toString()+" Removed");
-  } //__________________________________
-
-//  Utility Methods
-
-  private DaoUidTable getDaoUid() throws Exception
-  { if (null==m_oDaoUid) m_oDaoUid 
-	  = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
-    return m_oDaoUid;
-  } //__________________________________
-
-  private DaoSnapTable getDaoSnap(BobjStore p_oSt) throws Exception
-  { if (null==m_oDaoSnap)
-      m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_oSt);
-    return m_oDaoSnap;
-  } //__________________________________
-
-  private DaoIndexTable getDaoIndex(BobjStore p_oSt,int p_i) throws Exception
-  { if (null==m_oaDaoIndex)
-	  m_oaDaoIndex = new DaoIndexTable[p_oSt.allLocatorTables().length];
-	if (null==m_oaDaoIndex[p_i])
-      m_oaDaoIndex[p_i] = new DaoIndexTable(m_oDataConn,p_oSt.getLocatorTable(p_i));
-    return m_oaDaoIndex[p_i];
-  } //__________________________________
-
-  protected ObjLocator[] doAddLocators(BobjStore pStore,BobjStdDTO p_oDto) throws Exception
-  { long lUid      = p_oDto.getUid();
-    if (lUid < 1)
-    { lUid = doAssignUid();
-      p_oDto.setUid(lUid);
-      p_oDto.setSnap(lUid);
-    }
-    long lStamp		= p_oDto.getStamp();
-    if (lStamp < 1)
-      p_oDto.setStamp(lStamp = System.currentTimeMillis());
-    
-    String[][] 	saa	  = p_oDto.getLocators();
-    ObjLocator[]oaRet = new ObjLocator[saa.length];
-    int iCurr = 0;
-    for (int i1=0; i1<saa.length; i1++)
-    {	String[] saCurr = saa[i1];
-    	ObjLocator  oLoc  = new ObjLocator(lUid,saCurr);
-		oaRet[iCurr]	  = oLoc;	
-	    String      sTbl  = pStore.getLocatorTable(iCurr++);
-	    if (null == sTbl)
-	    	continue;
-	
-	    DaoIndexTable oDao = new DaoIndexTable(m_oDataConn,sTbl);
-	    PreparedStatement PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
-	
-	    PS.setLong    (DaoIndexTable.OBJECT_UID,lUid);
-	    PS.setLong    (DaoIndexTable.TIMESTAMP,lStamp);
-	    PS.setLong    (DaoIndexTable.UID_SNAP,p_oDto.getSnap());
-	    PS.setString  (DaoIndexTable.SNAP_DATE,s_oY4md.format(new Date(lStamp)));
-	
-	    int iFld  = DaoIndexTable.FIRST_FIELD;
-	    for (int i2=0; i2<saCurr.length; i2++)
-	    { String sFldVal = saCurr[i2];
-	      PS.setString(iFld++,(null == sFldVal)?"":sFldVal);
-	    }
-	    m_oDataConn.execUpdWait(PS,1);
-    }
-
-    return oaRet;
-  } //__________________________________
-
-  private void doDelLocators (BobjStore p_oSt, long p_lUid)
-  { if (p_lUid < 1)     return;
-  	int iQlocs = p_oSt.allLocatorTables().length;
-  	for (int i1=0; i1<iQlocs; i1++)
-	  	try
-	    { PreparedStatement PS = getDaoIndex(p_oSt,i1).getPS(DaoIndexTable.PS_RMV_INDEX);
-	      PS.setLong(1,p_lUid);
-	      m_oDataConn.execQueryWait(PS,5);
-	    }
-	    catch (Exception e)
-	    { m_oLogger.warn("doDelLocator() FAILED <"+e.getMessage()+">");
-	    }
-  } //__________________________________
-
-  private void doDelOneSnap (BobjStore p_oSt,long p_lUid) throws Exception
-  { if (p_lUid < 1)     return;
-  	PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_RMV_SNAP);
-    PS.setLong(1,p_lUid);
-    m_oDataConn.execQueryWait(PS,5);
-  } //__________________________________
-
-  private void doRmvSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
-  {
-    PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_4UPD);
-    PS.setLong(1,p_lUid);
-    ResultSet rs = m_oDataConn.execQueryWait(PS,30);
-    if (! rs.next()) throw new Exception("Non existing Snapshot");
-    long lObjUid  = rs.getLong(DaoSnapTable.OBJECT_UID);
-
-    doDelOneSnap(p_oSt,p_lUid);
-    doDelLocators(p_oSt,lObjUid);
-
-  } //__________________________________
-
-  private void doRplSnapshot(BobjStdDTO p_oDto)
-      throws Exception
-  { long lSnapUid = p_oDto.getSnap();
-    BobjStore oSt = BobjStore.getStore(p_oDto);
-    doDelOneSnap(oSt,lSnapUid);
-    doDelLocators(oSt,p_oDto.getUid());
-    doAddSnapshot(p_oDto,false);
-  } //__________________________________
-
-  private long doAddSnapshot(BobjStdDTO p_oDto)
-      throws Exception
-  { return doAddSnapshot(p_oDto,true);
-  } //__________________________________
-
-  SimpleDateFormat s_oY4md = new SimpleDateFormat("yyyyMMdd");
-  private long doAddSnapshot(BobjStdDTO p_oDto, boolean p_bNewVrs)
-      throws Exception
-  { long lObjUid  = p_oDto.getUid();
-    if (lObjUid < 1)  p_oDto.setUid(lObjUid=doAssignUid());
-    p_oDto.setSnap(lObjUid);
-
-    // Set Timestamp
-    long lNow      = System.currentTimeMillis();
-    p_oDto.setStamp(lNow);
-    p_oDto.setSnapDate(s_oY4md.format(new Date(lNow)));
-
-    BobjStore oSt = BobjStore.getStore(p_oDto);
-    PreparedStatement PS = getDaoSnap(oSt).getPS(DaoSnapTable.PS_INS_SNAP);
-    getDaoSnap(oSt).setInsValues(PS,p_oDto);
-
-    m_oDataConn.execUpdWait(PS,1);
-
-    int iQlocs = oSt.allLocatorTables().length;
-    for (int i1=0; i1<iQlocs; i1++)
-    {	DaoIndexTable oDao = getDaoIndex(oSt,i1);
-    	PS  = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
-	    oDao.setInsValues(PS,p_oDto);
-	    try { m_oDataConn.execUpdWait(PS,1); }
-	    catch (Exception e)
-	    { PS  = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
-	      oDao.setUpdValues(PS,p_oDto);
-	      m_oDataConn.execUpdWait(PS,10);
-	    }
-    }
-
-    return lObjUid;
-    } //__________________________________
-
-	protected void updateLocTbl(BobjStdDTO p_oDto, int p_iNum)
-        throws Exception
-    { BobjStore oSt = BobjStore.getStore(p_oDto);
-      String sTbl = oSt.getLocatorTable(p_iNum);
-      if (null==sTbl)   return;
-      DaoIndexTable oDao = getDaoIndex(oSt,p_iNum);
-      PreparedStatement PSupd = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
-      oDao.setUpdValues(PSupd, p_oDto);
-
-      m_oDataConn.execUpdWait(PSupd,10);
-  } //__________________________________
-
-  private BobjStdDTO doGetSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
-  { PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_SNAP);
-    PS.setLong(1,p_lUid);
-    ResultSet rs = m_oDataConn.execQueryWait(PS,30);
-    if (! rs.next()) throw new Exception("Non existing Snapshot");
-    BobjStdDTO oRet = (BobjStdDTO)getDaoSnap(p_oSt).getFromRS(rs);
-    return oRet;
-  } //__________________________________
-
-  private void releaseResources()
-  { if (null!=m_oaDaoIndex)
-	  for (int i1=0; i1<m_oaDaoIndex.length; i1++)
-		  m_oaDaoIndex[i1] = null;
-  	m_oaDaoIndex = null;
-    m_oDaoSnap  = null;
-    m_oDaoUid   = null;
-    if (null != m_oDataConn)  m_oDataConn.release();
-    if (null != m_oUidConn)   m_oUidConn.release();
-  } //__________________________________
-
-  public long doAssignUid() throws Exception
-  { if (m_iChunkLeft < 1)
-    { m_lUid = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ, s_iChunkSize);
-      m_iChunkLeft  = s_iChunkSize;
-    }
-    m_iChunkLeft--;
-    return ++m_lUid;
-  } //__________________________________
-
-//______________________________________________________________________________
-// Public local and remote interface methods
-  /**
-   * @ejb.interface-method
-   * 		view-type="both"
-   */
-  public long getUidChunk (int p_iQ)  throws Exception
-  { try { return getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ,p_iQ); }
-    catch (Exception e) { throw e;}
-    finally { releaseResources(); }
-  } //__________________________________
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * @param p_sClassName
- * @param p_lUid
- * @throws Exception
- */
-  public void rmvObject(String p_sClassName, long p_lUid) throws Exception
-  { try { doRmvSnapshot(BobjStore.getStore(p_sClassName), p_lUid); m_oDataConn.commit(); }
-    catch (Exception e)
-    { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
-      catch (Exception eRoll) {}
-      throw e;
-    }
-    finally { releaseResources(); }
-  } //__________________________________
-
-/**
- * @ejb.interface-method
- * 		view-type="both"
- */
-  public long addDTO(BobjStdDTO p_oDto) throws Exception
-  { try 
-  	{	long lRet = doAddSnapshot(p_oDto);
-	  	m_oDataConn.commit();
-	  	return lRet;
-  	}
-	catch (Exception e)
-	{ try { if (null != m_oDataConn) m_oDataConn.rollback(); }
-	  catch (Exception eRoll) {}
-	  throw e;
-	}
-	finally { releaseResources(); }
-  } //__________________________________
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * @param p_sClassName - String  Fully qualified name of class to be retrieved
- * @param p_lUid
- * @return
- * @throws Exception
- */
-  public BobjStdDTO getDTO (String p_sClassName, long p_lUid)      throws Exception
-  { try { return doGetSnapshot(BobjStore.getStore(p_sClassName), p_lUid);}
-    catch (Exception e) { throw e; }
-    finally { releaseResources(); }
-  } //__________________________________
-/**
- * @ejb.interface-method
- * 		view-type="both"
- * 
- * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
- * @throws Exception
- */
-  public void rplDTO(BobjStdDTO p_oDto) throws Exception
-  { try 
-	{	doRplSnapshot(p_oDto);
-	  	m_oDataConn.commit();
-	}
-	catch (Exception e)
-	{ try { if (null != m_oDataConn) m_oDataConn.rollback(); }
-	  catch (Exception eRoll) {}
-	  throw e;
-	}
-	finally { releaseResources(); }
-  } //__________________________________
-
-} //____________________________________________________________________________

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerHome
-   extends javax.ejb.EJBHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbPersistHandler";
-   public static final String JNDI_NAME="JbossEsbPersistHandler";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbPersistHandler create()
-      throws javax.ejb.CreateException,java.rmi.RemoteException;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,27 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 12 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerLocal
-   extends javax.ejb.EJBLocalObject
-{
-
-   public long getUidChunk( int p_iQ ) throws java.lang.Exception;
-
-   public void rmvObject( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
-   public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-   public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
-
-   public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
-
-}

Deleted: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -1,22 +0,0 @@
-/*
- * Generated by XDoclet - Do not edit!
- */
-package org.jboss.soa.esb.services.EJB;
-
-/**
- * Local home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 24 2006
- * @copyright The XDoclet Team
- * @author XDoclet
- * @version ${version}
- */
-public interface JbossEsbPersistHandlerLocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public static final String COMP_NAME="java:comp/env/ejb/JbossEsbPersistHandlerLocal";
-   public static final String JNDI_NAME="JbossEsbPersistHandlerLocal";
-
-   public org.jboss.soa.esb.services.EJB.JbossEsbPersistHandlerLocal create()
-      throws javax.ejb.CreateException;
-
-}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+import java.io.Serializable;
+
+/**
+ * Remote interface for NotificationHandler.
+ * @xdoclet-generated at July 24 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface NotificationHandler
+   extends javax.ejb.EJBObject
+{
+
+   public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,119 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+
+
+package org.jboss.soa.esb.services.EJB;
+
+import java.io.Serializable;
+import javax.ejb.*;
+import javax.naming.*;
+import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.helpers.*;
+import org.jboss.soa.esb.notification.*;
+
+import org.apache.log4j.*;
+/**
+ * @ejb.bean description="NotificationHandler"
+ *           display-name="Notification_Handler"
+ *           jndi-name="NotificationHandler"
+ * 			 local-jndi-name="NotificationHandlerLocal"
+ *           name="NotificationHandler"
+ *           type="Stateless"
+ *           view-type="both"
+ * 			 transaction-type="Container"
+ * @ejb.transaction type="Required"
+ * @author
+ */
+public class NotificationHandlerBean implements SessionBean
+{
+  private static final long serialVersionUID = 1L;
+  private Logger        m_oLogger;
+  SessionContext        m_ctxSess;
+
+  public void ejbActivate()   {}
+  public void ejbPassivate()  {}
+  public void setSessionContext(SessionContext sessionContext)
+    { m_ctxSess = sessionContext; }
+/**
+ * @ejb.create-method
+ * @throws CreateException
+ */
+  public void ejbCreate() throws CreateException
+  { try
+    { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+//      Context oCtxInit   =
+    	  new InitialContext();
+
+      m_oLogger.info(this.toString()+" Created");
+    }
+    catch (Exception e)
+    { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
+      throw new CreateException(e.getMessage());
+    }
+  } //__________________________________
+
+  public void ejbRemove()
+  { m_oLogger.info(this.toString()+" Removed");
+  } //__________________________________
+
+//  Utility Methods
+
+  protected void releaseResources()
+  {
+  } //__________________________________
+
+//______________________________________________________________________________
+// Public local and remote interface methods
+
+  private static final String s_sDfltList =
+      "<NotificationList  type=\"Error\" >"
+        +" <target"
+        +" class       = \"NotifyEmail\""
+        +" from        = \"JbossEsbDefault at myOrg.com\""
+        +" sendTo      = \"\""
+        +" subject     = \"Default JBoss ESB Notification\""
+        +" message     = \" Message from JBoss ESB :\""
+        +" />"
+    +" </NotificationList>"
+    ;
+  private static NotificationList s_dfltList;
+  static
+  { try
+    { s_dfltList = new NotificationList(DomElement.fromXml(s_sDfltList)); }
+    catch (Exception e) { e.printStackTrace(System.out); }
+  }
+/**
+ * @ejb.interface-method
+ * @param p_sParams
+ * @param p_sMsg
+ * @throws Exception
+ */
+  public void sendNotifications(String p_sParams, Serializable p_oMsg)
+    throws Exception
+  {
+	DomElement oP = (null==p_sParams)?null:DomElement.fromXml(p_sParams);
+    NotificationList m_oL = (null==oP) ? s_dfltList : new NotificationList(oP);
+    m_oL.sendNotification(p_oMsg);
+  } //__________________________________
+
+} //____________________________________________________________________________

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Home interface for NotificationHandler.
+ * @xdoclet-generated at July 27 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface NotificationHandlerHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/NotificationHandler";
+   public static final String JNDI_NAME="NotificationHandler";
+
+   public org.jboss.soa.esb.services.EJB.NotificationHandler create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,21 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+import java.io.Serializable;
+
+/**
+ * Local interface for NotificationHandler.
+ * @xdoclet-generated at July 5 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface NotificationHandlerLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public void sendNotifications( java.lang.String p_sParams,Serializable p_sMsg ) throws java.lang.Exception;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Local home interface for NotificationHandler.
+ * @xdoclet-generated at July 27 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface NotificationHandlerLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/NotificationHandlerLocal";
+   public static final String JNDI_NAME="NotificationHandlerLocal";
+
+   public org.jboss.soa.esb.services.EJB.NotificationHandlerLocal create()
+      throws javax.ejb.CreateException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandler.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,32 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Remote interface for PersistHandler.
+ * @xdoclet-generated at July 24 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface PersistHandler
+   extends javax.ejb.EJBObject
+{
+
+   public long getUidChunk( int p_iQ )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void rmvObject( java.lang.String p_sClassName,long p_lUid )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+   public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto )
+      throws java.lang.Exception, java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,367 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+
+
+package org.jboss.soa.esb.services.EJB;
+
+import javax.ejb.*;
+import javax.naming.*;
+import java.sql.*;
+import javax.sql.*;
+
+import java.text.*;
+import java.io.*;
+
+import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.helpers.persist.*;
+import org.jboss.soa.esb.internal.core.objectstore.*;
+
+import org.apache.log4j.*;
+
+/**
+ * @ejb.bean
+ * name="PersistHandler"
+ * display-name="PERSIST_HANDLER"
+ * type="Stateless"
+ * view-type="both"
+ * jndi-name="PersistHandler"
+ * local-jndi-name="PersistHandlerLocal"
+ * transaction-type="Bean"
+ * @author Esteban
+ */
+public class PersistHandlerBean implements SessionBean
+{
+  private static final long serialVersionUID = 1L;
+  private Logger        m_oLogger;
+  SessionContext        m_ctxSess;
+
+  private JdbcCleanConn m_oUidConn;
+  private JdbcCleanConn m_oDataConn;
+
+  private static final int s_iChunkSize=100;
+  private long          m_lUid;
+  private int           m_iChunkLeft=0;
+
+  private DaoUidTable   m_oDaoUid;
+  private DaoSnapTable  m_oDaoSnap;
+  private DaoIndexTable[] m_oaDaoIndex;
+
+  public void ejbActivate()   {}
+  public void ejbPassivate()  {}
+  public void setSessionContext(SessionContext sessionContext)
+    { m_ctxSess = sessionContext; }
+/**
+ * @ejb.create-method
+ * @throws CreateException
+ */
+  public void ejbCreate() throws CreateException
+  { try
+    { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+      Context oCtxInit   = new InitialContext();
+      String sDSjndiName = BobjStore.getDataSourceJndi();
+      DataSource oDS = (DataSource)oCtxInit.lookup(sDSjndiName);
+      m_oUidConn  = new JdbcCleanConn(oDS);
+      m_oDataConn = new JdbcCleanConn(oDS);
+
+      Class oCls = Class.forName("org.jboss.soa.esb.util.BobjStdDTO");
+      ObjectStreamClass XX = ObjectStreamClass.lookup(oCls);
+      System.out.println(XX.getSerialVersionUID());
+      System.out.println(oCls.getProtectionDomain().getCodeSource().getLocation());
+
+      m_oLogger.info(this.toString()+" Created");
+    }
+    catch (Exception e)
+    { m_oLogger.error("EJB Create Failed <"+e.getMessage()+">");
+      throw new CreateException(e.getMessage());
+    }
+  } //__________________________________
+
+  public void ejbRemove()
+  { m_oLogger.info(this.toString()+" Removed");
+  } //__________________________________
+
+//  Utility Methods
+
+  private DaoUidTable getDaoUid() throws Exception
+  { if (null==m_oDaoUid) m_oDaoUid 
+	  = new DaoUidTable(m_oUidConn,BobjStore.getUidTableName());
+    return m_oDaoUid;
+  } //__________________________________
+
+  private DaoSnapTable getDaoSnap(BobjStore p_oSt) throws Exception
+  { if (null==m_oDaoSnap)
+      m_oDaoSnap = new DaoSnapTable(m_oDataConn,p_oSt);
+    return m_oDaoSnap;
+  } //__________________________________
+
+  private DaoIndexTable getDaoIndex(BobjStore p_oSt,int p_i) throws Exception
+  { if (null==m_oaDaoIndex)
+	  m_oaDaoIndex = new DaoIndexTable[p_oSt.allLocatorTables().length];
+	if (null==m_oaDaoIndex[p_i])
+      m_oaDaoIndex[p_i] = new DaoIndexTable(m_oDataConn,p_oSt.getLocatorTable(p_i));
+    return m_oaDaoIndex[p_i];
+  } //__________________________________
+
+  protected ObjLocator[] doAddLocators(BobjStore pStore,BobjStdDTO p_oDto) throws Exception
+  { long lUid      = p_oDto.getUid();
+    if (lUid < 1)
+    { lUid = doAssignUid();
+      p_oDto.setUid(lUid);
+      p_oDto.setSnap(lUid);
+    }
+    long lStamp		= p_oDto.getStamp();
+    if (lStamp < 1)
+      p_oDto.setStamp(lStamp = System.currentTimeMillis());
+    
+    String[][] 	saa	  = p_oDto.getLocators();
+    ObjLocator[]oaRet = new ObjLocator[saa.length];
+    int iCurr = 0;
+    for (int i1=0; i1<saa.length; i1++)
+    {	String[] saCurr = saa[i1];
+    	ObjLocator  oLoc  = new ObjLocator(lUid,saCurr);
+		oaRet[iCurr]	  = oLoc;	
+	    String      sTbl  = pStore.getLocatorTable(iCurr++);
+	    if (null == sTbl)
+	    	continue;
+	
+	    DaoIndexTable oDao = new DaoIndexTable(m_oDataConn,sTbl);
+	    PreparedStatement PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
+	
+	    PS.setLong    (DaoIndexTable.OBJECT_UID,lUid);
+	    PS.setLong    (DaoIndexTable.TIMESTAMP,lStamp);
+	    PS.setLong    (DaoIndexTable.UID_SNAP,p_oDto.getSnap());
+	    PS.setString  (DaoIndexTable.SNAP_DATE,s_oY4md.format(new Date(lStamp)));
+	
+	    int iFld  = DaoIndexTable.FIRST_FIELD;
+	    for (int i2=0; i2<saCurr.length; i2++)
+	    { String sFldVal = saCurr[i2];
+	      PS.setString(iFld++,(null == sFldVal)?"":sFldVal);
+	    }
+	    m_oDataConn.execUpdWait(PS,1);
+    }
+
+    return oaRet;
+  } //__________________________________
+
+  private void doDelLocators (BobjStore p_oSt, long p_lUid)
+  { if (p_lUid < 1)     return;
+  	int iQlocs = p_oSt.allLocatorTables().length;
+  	for (int i1=0; i1<iQlocs; i1++)
+	  	try
+	    { PreparedStatement PS = getDaoIndex(p_oSt,i1).getPS(DaoIndexTable.PS_RMV_INDEX);
+	      PS.setLong(1,p_lUid);
+	      m_oDataConn.execQueryWait(PS,5);
+	    }
+	    catch (Exception e)
+	    { m_oLogger.warn("doDelLocator() FAILED <"+e.getMessage()+">");
+	    }
+  } //__________________________________
+
+  private void doDelOneSnap (BobjStore p_oSt,long p_lUid) throws Exception
+  { if (p_lUid < 1)     return;
+  	PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_RMV_SNAP);
+    PS.setLong(1,p_lUid);
+    m_oDataConn.execQueryWait(PS,5);
+  } //__________________________________
+
+  private void doRmvSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
+  {
+    PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_4UPD);
+    PS.setLong(1,p_lUid);
+    ResultSet rs = m_oDataConn.execQueryWait(PS,30);
+    if (! rs.next()) throw new Exception("Non existing Snapshot");
+    long lObjUid  = rs.getLong(DaoSnapTable.OBJECT_UID);
+
+    doDelOneSnap(p_oSt,p_lUid);
+    doDelLocators(p_oSt,lObjUid);
+
+  } //__________________________________
+
+  private void doRplSnapshot(BobjStdDTO p_oDto)
+      throws Exception
+  { long lSnapUid = p_oDto.getSnap();
+    BobjStore oSt = BobjStore.getStore(p_oDto);
+    doDelOneSnap(oSt,lSnapUid);
+    doDelLocators(oSt,p_oDto.getUid());
+    doAddSnapshot(p_oDto,false);
+  } //__________________________________
+
+  private long doAddSnapshot(BobjStdDTO p_oDto)
+      throws Exception
+  { return doAddSnapshot(p_oDto,true);
+  } //__________________________________
+
+  SimpleDateFormat s_oY4md = new SimpleDateFormat("yyyyMMdd");
+  private long doAddSnapshot(BobjStdDTO p_oDto, boolean p_bNewVrs)
+      throws Exception
+  { long lObjUid  = p_oDto.getUid();
+    if (lObjUid < 1)  p_oDto.setUid(lObjUid=doAssignUid());
+    p_oDto.setSnap(lObjUid);
+
+    // Set Timestamp
+    long lNow      = System.currentTimeMillis();
+    p_oDto.setStamp(lNow);
+    p_oDto.setSnapDate(s_oY4md.format(new Date(lNow)));
+
+    BobjStore oSt = BobjStore.getStore(p_oDto);
+    PreparedStatement PS = getDaoSnap(oSt).getPS(DaoSnapTable.PS_INS_SNAP);
+    getDaoSnap(oSt).setInsValues(PS,p_oDto);
+
+    m_oDataConn.execUpdWait(PS,1);
+
+    int iQlocs = oSt.allLocatorTables().length;
+    for (int i1=0; i1<iQlocs; i1++)
+    {	DaoIndexTable oDao = getDaoIndex(oSt,i1);
+    	PS  = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
+	    oDao.setInsValues(PS,p_oDto);
+	    try { m_oDataConn.execUpdWait(PS,1); }
+	    catch (Exception e)
+	    { PS  = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
+	      oDao.setUpdValues(PS,p_oDto);
+	      m_oDataConn.execUpdWait(PS,10);
+	    }
+    }
+
+    return lObjUid;
+    } //__________________________________
+
+	protected void updateLocTbl(BobjStdDTO p_oDto, int p_iNum)
+        throws Exception
+    { BobjStore oSt = BobjStore.getStore(p_oDto);
+      String sTbl = oSt.getLocatorTable(p_iNum);
+      if (null==sTbl)   return;
+      DaoIndexTable oDao = getDaoIndex(oSt,p_iNum);
+      PreparedStatement PSupd = oDao.getPS(DaoIndexTable.PS_UPD_INDEX);
+      oDao.setUpdValues(PSupd, p_oDto);
+
+      m_oDataConn.execUpdWait(PSupd,10);
+  } //__________________________________
+
+  private BobjStdDTO doGetSnapshot (BobjStore p_oSt,long p_lUid) throws Exception
+  { PreparedStatement PS = getDaoSnap(p_oSt).getPS(DaoSnapTable.PS_SEL_SNAP);
+    PS.setLong(1,p_lUid);
+    ResultSet rs = m_oDataConn.execQueryWait(PS,30);
+    if (! rs.next()) throw new Exception("Non existing Snapshot");
+    BobjStdDTO oRet = (BobjStdDTO)getDaoSnap(p_oSt).getFromRS(rs);
+    return oRet;
+  } //__________________________________
+
+  private void releaseResources()
+  { if (null!=m_oaDaoIndex)
+	  for (int i1=0; i1<m_oaDaoIndex.length; i1++)
+		  m_oaDaoIndex[i1] = null;
+  	m_oaDaoIndex = null;
+    m_oDaoSnap  = null;
+    m_oDaoUid   = null;
+    if (null != m_oDataConn)  m_oDataConn.release();
+    if (null != m_oUidConn)   m_oUidConn.release();
+  } //__________________________________
+
+  public long doAssignUid() throws Exception
+  { if (m_iChunkLeft < 1)
+    { m_lUid = getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ, s_iChunkSize);
+      m_iChunkLeft  = s_iChunkSize;
+    }
+    m_iChunkLeft--;
+    return ++m_lUid;
+  } //__________________________________
+
+//______________________________________________________________________________
+// Public local and remote interface methods
+  /**
+   * @ejb.interface-method
+   * 		view-type="both"
+   */
+  public long getUidChunk (int p_iQ)  throws Exception
+  { try { return getDaoUid().getUidChunk(DaoUidTable.SEQUENCE_OBJ,p_iQ); }
+    catch (Exception e) { throw e;}
+    finally { releaseResources(); }
+  } //__________________________________
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * @param p_sClassName
+ * @param p_lUid
+ * @throws Exception
+ */
+  public void rmvObject(String p_sClassName, long p_lUid) throws Exception
+  { try { doRmvSnapshot(BobjStore.getStore(p_sClassName), p_lUid); m_oDataConn.commit(); }
+    catch (Exception e)
+    { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+      catch (Exception eRoll) {}
+      throw e;
+    }
+    finally { releaseResources(); }
+  } //__________________________________
+
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ */
+  public long addDTO(BobjStdDTO p_oDto) throws Exception
+  { try 
+  	{	long lRet = doAddSnapshot(p_oDto);
+	  	m_oDataConn.commit();
+	  	return lRet;
+  	}
+	catch (Exception e)
+	{ try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+	  catch (Exception eRoll) {}
+	  throw e;
+	}
+	finally { releaseResources(); }
+  } //__________________________________
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * @param p_sClassName - String  Fully qualified name of class to be retrieved
+ * @param p_lUid
+ * @return
+ * @throws Exception
+ */
+  public BobjStdDTO getDTO (String p_sClassName, long p_lUid)      throws Exception
+  { try { return doGetSnapshot(BobjStore.getStore(p_sClassName), p_lUid);}
+    catch (Exception e) { throw e; }
+    finally { releaseResources(); }
+  } //__________________________________
+/**
+ * @ejb.interface-method
+ * 		view-type="both"
+ * 
+ * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
+ * @throws Exception
+ */
+  public void rplDTO(BobjStdDTO p_oDto) throws Exception
+  { try 
+	{	doRplSnapshot(p_oDto);
+	  	m_oDataConn.commit();
+	}
+	catch (Exception e)
+	{ try { if (null != m_oDataConn) m_oDataConn.rollback(); }
+	  catch (Exception eRoll) {}
+	  throw e;
+	}
+	finally { releaseResources(); }
+  } //__________________________________
+
+} //____________________________________________________________________________

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Home interface for PersistHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface PersistHandlerHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/PersistHandler";
+   public static final String JNDI_NAME="PersistHandler";
+
+   public org.jboss.soa.esb.services.EJB.PersistHandler create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,27 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Local interface for PersistHandler.
+ * @xdoclet-generated at July 12 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface PersistHandlerLocal
+   extends javax.ejb.EJBLocalObject
+{
+
+   public long getUidChunk( int p_iQ ) throws java.lang.Exception;
+
+   public void rmvObject( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
+
+   public long addDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
+
+   public org.jboss.soa.esb.util.BobjStdDTO getDTO( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
+
+   public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
+
+}

Copied: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java (from rev 5384, labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java)
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java	2006-08-01 18:47:29 UTC (rev 5384)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerLocalHome.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.jboss.soa.esb.services.EJB;
+
+/**
+ * Local home interface for PersistHandler.
+ * @xdoclet-generated at July 24 2006
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface PersistHandlerLocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/PersistHandlerLocal";
+   public static final String JNDI_NAME="PersistHandlerLocal";
+
+   public org.jboss.soa.esb.services.EJB.PersistHandlerLocal create()
+      throws javax.ejb.CreateException;
+
+}

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -30,12 +30,12 @@
 
 public class NotifHandlerBsDelegateLocal implements InotificationHandler
 {
-  private  JbossEsbNotificationHandlerLocal    m_oNotifH;
+  private  NotificationHandlerLocal    m_oNotifH;
   public NotifHandlerBsDelegateLocal(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbNotificationHandlerLocal");
+    Object ref = p_ctx.lookup("NotificationHandlerLocal");
 
-    JbossEsbNotificationHandlerLocalHome oHu = (JbossEsbNotificationHandlerLocalHome) ref;
+    NotificationHandlerLocalHome oHu = (NotificationHandlerLocalHome) ref;
     m_oNotifH = oHu.create();
   } //__________________________________
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/NotifHandlerBsDelegateRemote.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -31,13 +31,13 @@
 
 public class NotifHandlerBsDelegateRemote implements InotificationHandler
 {
-  private  JbossEsbNotificationHandler    m_oNotifH;
+  private  NotificationHandler    m_oNotifH;
 
   public NotifHandlerBsDelegateRemote(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbNotificationHandler");
-    Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbNotificationHandlerHome.class);
-    JbossEsbNotificationHandlerHome oHu = (JbossEsbNotificationHandlerHome) oNarr;
+    Object ref = p_ctx.lookup("NotificationHandler");
+    Object oNarr = PortableRemoteObject.narrow(ref, NotificationHandlerHome.class);
+    NotificationHandlerHome oHu = (NotificationHandlerHome) oNarr;
     m_oNotifH = oHu.create();
   } //__________________________________
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -32,13 +32,13 @@
 
 public class PersistHandlerBsDelegateLocal implements IpersistHandler
 {
-  private  JbossEsbPersistHandlerLocal    m_oSnapH;
+  private  PersistHandlerLocal    m_oSnapH;
 
   public PersistHandlerBsDelegateLocal(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbPersistHandlerLocal");
+    Object ref = p_ctx.lookup("PersistHandlerLocal");
 
-    JbossEsbPersistHandlerLocalHome oHu = (JbossEsbPersistHandlerLocalHome) ref;
+    PersistHandlerLocalHome oHu = (PersistHandlerLocalHome) ref;
     m_oSnapH = oHu.create();
   } //__________________________________
 

Modified: labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java	2006-08-01 22:11:11 UTC (rev 5391)
+++ labs/jbossesb/branches/refactor/product/core/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java	2006-08-01 22:32:20 UTC (rev 5392)
@@ -33,13 +33,13 @@
 
 public class PersistHandlerBsDelegateRemote implements IpersistHandler
 {
-  private  JbossEsbPersistHandler    m_oSnapH;
+  private  PersistHandler    m_oSnapH;
 
   public PersistHandlerBsDelegateRemote(Context p_ctx) throws Exception
   {
-    Object ref = p_ctx.lookup("JbossEsbPersistHandler");
-    Object oNarr = PortableRemoteObject.narrow(ref, JbossEsbPersistHandlerHome.class);
-    JbossEsbPersistHandlerHome oHu = (JbossEsbPersistHandlerHome) oNarr;
+    Object ref = p_ctx.lookup("PersistHandler");
+    Object oNarr = PortableRemoteObject.narrow(ref, PersistHandlerHome.class);
+    PersistHandlerHome oHu = (PersistHandlerHome) oNarr;
     m_oSnapH = oHu.create();
   } //__________________________________
 




More information about the jboss-svn-commits mailing list