[jboss-svn-commits] JBL Code SVN: r5042 - in labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb: internal/core/objectstore services services/EJB
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 12 10:52:11 EDT 2006
Author: estebanschifman
Date: 2006-07-12 10:52:00 -0400 (Wed, 12 Jul 2006)
New Revision: 5042
Modified:
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
Log:
Persistence changed to avoid dependence on user classes. Only BobjStdDTO is used now
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -43,8 +43,8 @@
public static void setBatchTableName(String p_s) { TBL_BATCHES = p_s; }
public static String getBatchTableName() { return TBL_BATCHES; }
- private static final Map<Class,BobjStore> s_oStoreMap
- = new HashMap<Class,BobjStore>();
+ private static final Map<String,BobjStore> s_oStoreMap
+ = new HashMap<String,BobjStore>();
static
{ try
@@ -68,7 +68,7 @@
for (DomElement oIcurr : oCurr.getElementChildren("Index"))
oNew.addLocatorTable(oIcurr.getAttr("table"));
- s_oStoreMap.put(Class.forName(sClass),oNew);
+ s_oStoreMap.put(sClass,oNew);
}
}
}
@@ -115,7 +115,16 @@
: (m_olLocators.size() <= p_n) ? null
: m_olLocators.get(p_n);
}
+
/**
+ * Obtain all locator table names
+ * @return Names of all locator tables
+ */
+ public String[] allLocatorTables()
+ { return (null==m_olLocators) ? new String[] {}
+ : m_olLocators.toArray(new String[m_olLocators.size()]);
+ }
+ /**
* Class suffix getter - Deprecated - Left here for backwards compatibility
* @return String - Class suffix
* @see Istorable#getLocatorTable()
@@ -176,21 +185,22 @@
* @see JbossEsbPersistHandler
* @see BobjStore#getStore(BusinessObject)
*/
- public static BobjStore getStore (Class p_oClass)
- { if (null == p_oClass) return null;
- return s_oStoreMap.get(p_oClass);
+ public static BobjStore getStore (String p_sClassName)
+ { if (EsbUtil.isNullString(p_sClassName)) return null;
+ return s_oStoreMap.get(p_sClassName);
} //__________________________________
/**
- * Get a BobjStore object that describes persistence details for the
- * object specified in arg 1
- * @param p_o BusinessObject The object whose storage descriptor is requested
+ * Get a BobjStore object that describes persistence details for
+ * BobjStdDTO <arg 1>
+ * @param p_sClassName BobjStdDTO for which we need an object store
* @return BobjStore - A descriptor that will provide persistence info
* @see JbossEsbPersistHandler
* @see BobjStore#getStore(String)
*/
- public static BobjStore getStore (BaseBusinessObject p_o)
- { return (null == p_o) ? null : getStore(p_o.getClass());
- } //__________________________________
+ public static BobjStore getStore (BobjStdDTO p_oDto)
+ { if (null == p_oDto) return null;
+ return getStore(p_oDto.fullClassName());
+ } //__________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -114,6 +114,9 @@
*/
public static final int FIRST_FIELD = s_iFld++;
+ public int setInsValues(PreparedStatement p_PS,Object p_o)
+ throws Exception
+ { return setInsValues (p_PS,p_o,0); }
/**
* Set values for insert statement
* @param p_PS PreparedStatement - The prepared SQL statement for insert in this
@@ -121,30 +124,31 @@
* <p>Must be the result of a previous call to this.getPS(PS_INS_INDEX)</p>
* @param p_o Object - Object to get values from
* <p>arg 2 is Object to comply with SqlDbTable abstract method setInsValues()
- * <li>For this particular class, arg 2 MUST be an instance of BusinessObject</li>
+ * <li>For this particular class, arg 2 MUST be an instance of BobjStdDTO</li>
* </p>
+ * @param p_iNum int - Index of which locator String[] should be used
* @throws Exception
* @return int
* @see DaoIndexTable#getPS(int)
* @see DaoIndexTable#PS_INS_INDEX
*/
- public int setInsValues(PreparedStatement p_PS,Object p_o)
+ public int setInsValues(PreparedStatement p_PS,Object p_o, int p_iNum)
throws Exception
{ try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BusinessObject");
+ { if (! (p_o instanceof BobjStdDTO)) throw
+ new Exception ("Parameter must be BobjStdDTO");
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
+ BobjStdDTO oDto = (BobjStdDTO)p_o;
p_PS.clearParameters();
- setLong (p_PS, OBJECT_UID ,oBO.getUid()); // Object's UID
- long lStamp = oBO.getStamp();
+ setLong (p_PS, OBJECT_UID ,oDto.getUid()); // Object's UID
+ long lStamp = oDto.getStamp();
setLong (p_PS, TIMESTAMP ,lStamp); // Timestamp
- setLong (p_PS, UID_SNAP ,oBO.getSnap()); // Snap UID
- setObject(p_PS, SNAP_DATE ,oBO.getSnapDate()); // Snap Date
+ setLong (p_PS, UID_SNAP ,oDto.getSnap()); // Snap UID
+ setObject(p_PS, SNAP_DATE ,oDto.getSnapDate()); // Snap Date
int iFld = FIRST_FIELD;
- String[] sa = oBO.locator();
+ String[] sa = oDto.getLocators()[p_iNum];
for (int i1=0; i1<sa.length;i1++)
if (iFld < m_oaFields.length) setObject(p_PS,iFld++,sa[i1]);
@@ -156,7 +160,11 @@
}
} //________________________________
- /**
+ public void setUpdValues(PreparedStatement p_PS,Object p_o)
+ throws Exception
+ { setUpdValues(p_PS,p_o,0); }
+
+ /**
* Set values for update statement
* @param p_PS PreparedStatement - The prepared SQL statement for update in this
* table
@@ -164,29 +172,30 @@
* @param p_o Object - Object to get values from
* <li>For this particular class, arg 2 MUST be an instance of BaseBusinessObject</li>
* </p>
+ * @param p_iNum int - Index of which locator String[] should be used
* @throws Exception
* @see DaoIndexTable#getPS(int)
* @see DaoIndexTable#PS_UPD_INDEX
*/
- public void setUpdValues(PreparedStatement p_PS,Object p_o)
+ public void setUpdValues(PreparedStatement p_PS,Object p_o, int p_iNum)
throws Exception
{ try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
+ { if (! (p_o instanceof BobjStdDTO)) throw
+ new Exception ("Parameter must be BobjStdDTO");
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
+ BobjStdDTO oDto = (BobjStdDTO)p_o;
int iFld = 0;
p_PS.clearParameters();
- setLong (p_PS, iFld++ ,oBO.getStamp()); // Timestamp
- setLong (p_PS, iFld++ ,oBO.getSnap()); // Snap UID
- setObject(p_PS, iFld++ ,oBO.getSnapDate());
+ setLong (p_PS, iFld++ ,oDto.getStamp()); // Timestamp
+ setLong (p_PS, iFld++ ,oDto.getSnap()); // Snap UID
+ setObject(p_PS, iFld++ ,oDto.getSnapDate());
- String[] sa = oBO.locator();
+ String[] sa = oDto.getLocators()[p_iNum];
for (int i1=0; i1<sa.length;i1++)
if (iFld < m_oaFields.length) setObject(p_PS,iFld++,sa[i1]);
- setLong(p_PS, iFld++, oBO.getUid());
+ setLong(p_PS, iFld++, oDto.getUid());
}
catch (Exception e)
{ m_oLog.error("setUpdValues() Failed",e);
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -27,7 +27,8 @@
import org.apache.log4j.*;
import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.BobjStdDTO;
import org.jboss.soa.esb.helpers.persist.*;
import org.jboss.soa.esb.services.*;
@@ -158,19 +159,19 @@
public int setInsValues(PreparedStatement p_PS,Object p_o)
throws Exception
{ try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
+ { if (! (p_o instanceof BobjStdDTO)) throw
+ new Exception ("Parameter must be BobjStdDTO");
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
- long lSnapUid = oBO.getSnap();
+ BobjStdDTO oDto = (BobjStdDTO)p_o;
+ long lSnapUid = oDto.getSnap();
p_PS.clearParameters();
setLong (p_PS, UID_SNAP ,lSnapUid);
- setLong (p_PS, TIMESTAMP ,oBO.getStamp()); // Timestamp
+ setLong (p_PS, TIMESTAMP ,oDto.getStamp()); // Timestamp
setObject(p_PS, SNAP_TYPE ,m_oST.getSnapType()); // Snap Type
- setLong (p_PS, OBJECT_UID ,oBO.getUid()); // Object's UID
- setLong (p_PS, BATCH_NUM ,oBO.getBatchNum()); // Batch Number
- byte[] baXml = oBO.toDTO().toXml().getBytes();
+ setLong (p_PS, OBJECT_UID ,oDto.getUid()); // Object's UID
+ setLong (p_PS, BATCH_NUM ,oDto.getBatch()); // Batch Number
+ byte[] baXml = oDto.toXml().getBytes();
p_PS.setBytes(1+XML_OBJECT,seeCrypt(baXml,lSnapUid));
return QFIELDS;
@@ -187,30 +188,30 @@
* table
* <p>Must be the result of a previous call to this.getPS(PS_UPD_SNAP)</p>
* @param p_o Object - Object to get values from
- * <li>For this particular class, arg 2 MUST be an instance of BaseBusinessObject</li>
+ * <li>For this particular class, arg 2 MUST be an instance of BobjStdDTO</li>
* </p>
* @throws Exception
* @see DaoSnapTable#getPS(int)
* @see DaoSnapTable#PS_UPD_SNAP
- * @see BaseBusinessObject
+ * @see BobjStdDTO
*/
public void setUpdValues(PreparedStatement p_PS,Object p_o)
throws Exception
{ try
- { if (! (p_o instanceof BaseBusinessObject)) throw
- new Exception ("Parameter must be BaseBusinessObject");
+ { if (! (p_o instanceof BobjStdDTO)) throw
+ new Exception ("Parameter must be BobjStdDTO");
- BaseBusinessObject oBO = (BaseBusinessObject)p_o;
- long lSnapUid = oBO.getSnap();
+ BobjStdDTO oDto = (BobjStdDTO)p_o;
+ long lSnapUid = oDto.getSnap();
p_PS.clearParameters();
int iFld = 0;
- setLong (p_PS, iFld++ ,oBO.getStamp()); // Timestamp
+ setLong (p_PS, iFld++ ,oDto.getStamp()); // Timestamp
setObject(p_PS, iFld++ ,m_oST.getSnapType()); // Snap Type
- setLong (p_PS, iFld++ ,oBO.getUid()); // Object's UID
- setLong (p_PS, iFld++ ,oBO.getBatchNum()); // Batch Number
- byte[] baXml = oBO.toDTO().toXml().getBytes();
+ setLong (p_PS, iFld++ ,oDto.getUid()); // Object's UID
+ setLong (p_PS, iFld++ ,oDto.getBatch()); // Batch Number
+ byte[] baXml = oDto.toXml().getBytes();
p_PS.setBytes(1+iFld++ ,seeCrypt(baXml,lSnapUid));
setLong (p_PS, iFld++ ,lSnapUid);
}
@@ -273,19 +274,19 @@
} //________________________________
/**
- * Returns a BaseBusinessObject containing data from the row in the current
+ * Returns a BobjStdDTO containing data from the row in the current
* cursor position of the ResultSet object <arg 1>
* @param p_oRS ResultSet - The current ResultSet
* <p>Must be the result of a previous execution of
* JdbcCleanConn.execQueryWait() method on a 'select' prepared statement for
* this object</p>
* @throws Exception
- * @return Object - A BaseBusinessObject
+ * @return Object - A BobjStdDTO
* @see JdbcCleanConn#execQueryWait(PreparedStatement, int)
* @see DaoSnapTable#getPS(int)
* @see DaoSnapTable#PS_SEL_SNAP
* @see DaoSnapTable#PS_SEL_4UPD
- * @see BaseBusinessObject
+ * @see BobjStdDTO
*/
public Object getFromRS (ResultSet p_oRS) throws Exception
{ try
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandler.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -148,7 +148,7 @@
} //__________________________________
private void doCommitBatch(BatchProcess p_oBP) throws Exception
- { Class oPrevClass = null;
+ { String sPrevClass = null;
BobjStore oStore = null;
PreparedStatement PSbatch = getDaoBatch(BobjStore.getBatchTableName())
@@ -162,31 +162,35 @@
ResultSet RS = m_oDataConn.execQueryWait(PSbatch,10);
while (RS.next())
{ String sXml = RS.getString(1+DaoBatchTable.STR_DATA);
- BaseBusinessObject oCurr = BaseBusinessObject.getFromDTO(BobjStdDTO.getFromXml(sXml));
+ BobjStdDTO oDto = BobjStdDTO.getFromXml(sXml);
// Get proper Dao's for Index and Snap table
- Class oNewClass = oCurr.getClass();
- if (! oNewClass.equals(oPrevClass))
- { oStore = BobjStore.getStore(oNewClass);
- oPrevClass = oNewClass;
+ 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
- oCurr.setBatchNum(p_oBP.getBatchNum());
- oCurr.setStamp (lNow);
- oCurr.setSnapDate(sSnapDt);
+ 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,oCurr);
+ m_oDaoSnap.setInsValues(PSins,oDto);
try { m_oDataConn.execUpdWait(PSins,10); }
catch (Exception e) { m_oLogger.error(e.getMessage()); }
- // Insert Index row
- PSins = getDaoIndex(oStore.getLocatorTable()).getPS(DaoIndexTable.PS_INS_INDEX);
- m_oDaoIndex.setInsValues(PSins,oCurr);
- 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();
@@ -200,7 +204,7 @@
p_oBP.setStamp (lNow);
p_oBP.setSnapDate(sSnapDt);
- oStore = BobjStore.getStore(BatchProcess.class);
+ oStore = BobjStore.getStore(BatchProcess.class.getName());
// Update snap table with proper timestamp
m_oDaoSnap = null;
@@ -220,6 +224,7 @@
// Public local and remote interface methods
/**
* @ejb.interface-method
+ * view-type="both"
*/
public long newBatch() throws Exception
{ if (m_lBatchNum > 0) throw
@@ -237,6 +242,7 @@
/**
* @ejb.interface-method
+ * view-type="both"
* @return
*/
public long getBatchNum()
@@ -245,6 +251,7 @@
/**
* @ejb.interface-method
+ * view-type="both"
* @param p_s
* @return
* @throws Exception
@@ -272,6 +279,7 @@
} //__________________________________
/**
* @ejb.interface-method
+ * view-type="both"
* @throws Exception
*/
public void finish() throws Exception
@@ -301,7 +309,7 @@
// Public remote interface methods
/**
* @ejb.interface-method
- * view-type="remote"
+ * view-type="both"
*/
public void commitBatch(BobjStdDTO p_oDto) throws Exception
{ commitBatch (new BatchProcess(p_oDto));
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocal.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -24,4 +24,6 @@
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;
+
}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerLocalHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbBatchHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandler.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 5 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 5 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocal.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 5 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerLocalHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbNotificationHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 5 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandler.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Remote interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -17,13 +17,13 @@
public long getUidChunk( int p_iQ )
throws java.lang.Exception, java.rmi.RemoteException;
- public void rmvObject( java.lang.Class pCls,long p_lUid )
+ 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.Class pCls,long p_lUid )
+ 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 )
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -47,7 +47,7 @@
* jndi-name="JbossEsbPersistHandler"
* local-jndi-name="JbossEsbPersistHandlerLocal"
* transaction-type="Bean"
- * @author Administrator
+ * @author Esteban
*/
public class JbossEsbPersistHandlerBean implements SessionBean
{
@@ -64,7 +64,7 @@
private DaoUidTable m_oDaoUid;
private DaoSnapTable m_oDaoSnap;
- private DaoIndexTable m_oDaoIndex;
+ private DaoIndexTable[] m_oaDaoIndex;
public void ejbActivate() {}
public void ejbPassivate() {}
@@ -114,58 +114,72 @@
return m_oDaoSnap;
} //__________________________________
- private DaoIndexTable getDaoIndex(BobjStore p_oSt) throws Exception
- { if (null==m_oDaoIndex)
- m_oDaoIndex = new DaoIndexTable(m_oDataConn,p_oSt.getLocatorTable());
- return m_oDaoIndex;
+ 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 doAddLocator(BaseBusinessObject p_oBO) throws Exception
- { long lUid = p_oBO.getUid();
+ protected ObjLocator[] doAddLocators(BobjStore pStore,BobjStdDTO p_oDto) throws Exception
+ { long lUid = p_oDto.getUid();
if (lUid < 1)
{ lUid = doAssignUid();
- p_oBO.setUid(lUid);
- p_oBO.setSnap(lUid);
+ p_oDto.setUid(lUid);
+ p_oDto.setSnap(lUid);
}
- ObjLocator oLoc = p_oBO.getObjLocator();
-
- BobjStore oSt = BobjStore.getStore(p_oBO);
- String sTbl = oSt.getLocatorTable();
- if (null == sTbl) return oLoc;
-
- DaoIndexTable oDao = new DaoIndexTable(m_oDataConn,sTbl);
- PreparedStatement PS = oDao.getPS(DaoIndexTable.PS_INS_INDEX);
-
- PS.setLong (DaoIndexTable.OBJECT_UID,lUid);
- long lStamp = p_oBO.getStamp();
- PS.setLong (DaoIndexTable.TIMESTAMP,lStamp);
- PS.setLong (DaoIndexTable.UID_SNAP,p_oBO.getSnap());
- PS.setString (DaoIndexTable.SNAP_DATE,s_oY4md.format(new Date(lStamp)));
-
- String[] sa = oLoc.getStrings();
- int iFld = DaoIndexTable.FIRST_FIELD;
- for (int i1=0; i1<sa.length;i1++)
- { String sCurr = sa[i1];
- PS.setString(iFld++,(null == sCurr)?"":sCurr);
+ 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);
}
- m_oDataConn.execUpdWait(PS,1);
- return oLoc;
+ return oaRet;
} //__________________________________
- private void doDelLocator (BobjStore p_oSt, long p_lUid)
- { if (p_lUid < 1) return;try
- { PreparedStatement PS = getDaoIndex(p_oSt).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 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);
+ { 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);
} //__________________________________
@@ -179,60 +193,66 @@
long lObjUid = rs.getLong(DaoSnapTable.OBJECT_UID);
doDelOneSnap(p_oSt,p_lUid);
- doDelLocator(p_oSt,lObjUid);
+ doDelLocators(p_oSt,lObjUid);
} //__________________________________
- private void doRplSnapshot(BaseBusinessObject p_oBo)
+ private void doRplSnapshot(BobjStdDTO p_oDto)
throws Exception
- { long lSnapUid = p_oBo.getSnap();
- BobjStore oSt = BobjStore.getStore(p_oBo);
+ { long lSnapUid = p_oDto.getSnap();
+ BobjStore oSt = BobjStore.getStore(p_oDto);
doDelOneSnap(oSt,lSnapUid);
- doDelLocator(oSt,p_oBo.getUid());
- doAddSnapshot(p_oBo,false);
+ doDelLocators(oSt,p_oDto.getUid());
+ doAddSnapshot(p_oDto,false);
} //__________________________________
- private long doAddSnapshot(BaseBusinessObject p_oBo)
+ private long doAddSnapshot(BobjStdDTO p_oDto)
throws Exception
- { return doAddSnapshot(p_oBo,true);
+ { return doAddSnapshot(p_oDto,true);
} //__________________________________
SimpleDateFormat s_oY4md = new SimpleDateFormat("yyyyMMdd");
- private long doAddSnapshot(BaseBusinessObject p_oBo, boolean p_bNewVrs)
+ private long doAddSnapshot(BobjStdDTO p_oDto, boolean p_bNewVrs)
throws Exception
- { long lObjUid = p_oBo.getUid();
- if (lObjUid < 1) p_oBo.setUid(lObjUid=doAssignUid());
- p_oBo.setSnap(lObjUid);
+ { long lObjUid = p_oDto.getUid();
+ if (lObjUid < 1) p_oDto.setUid(lObjUid=doAssignUid());
+ p_oDto.setSnap(lObjUid);
// Set Timestamp
long lNow = System.currentTimeMillis();
- p_oBo.setStamp(lNow);
- p_oBo.setSnapDate(s_oY4md.format(new Date(lNow)));
+ p_oDto.setStamp(lNow);
+ p_oDto.setSnapDate(s_oY4md.format(new Date(lNow)));
- BobjStore oSt = BobjStore.getStore(p_oBo);
+ BobjStore oSt = BobjStore.getStore(p_oDto);
PreparedStatement PS = getDaoSnap(oSt).getPS(DaoSnapTable.PS_INS_SNAP);
- getDaoSnap(oSt).setInsValues(PS,p_oBo);
+ getDaoSnap(oSt).setInsValues(PS,p_oDto);
m_oDataConn.execUpdWait(PS,1);
- PS = getDaoIndex(oSt).getPS(DaoIndexTable.PS_INS_INDEX);
- getDaoIndex(oSt).setInsValues(PS,p_oBo);
- try { m_oDataConn.execUpdWait(PS,1); }
- catch (Exception e)
- { PS = getDaoIndex(oSt).getPS(DaoIndexTable.PS_UPD_INDEX);
- getDaoIndex(oSt).setUpdValues(PS,p_oBo);
- m_oDataConn.execUpdWait(PS,10);
+ 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(BaseBusinessObject p_oBo)
+ protected void updateLocTbl(BobjStdDTO p_oDto, int p_iNum)
throws Exception
- { BobjStore oSt = BobjStore.getStore(p_oBo);
- String sTbl = oSt.getLocatorTable();
- if (null==sTbl) return;PreparedStatement PSupd = getDaoIndex(oSt).getPS(DaoIndexTable.PS_UPD_INDEX);
- getDaoIndex(oSt).setUpdValues(PSupd, p_oBo);
+ { 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);
} //__________________________________
@@ -247,7 +267,10 @@
} //__________________________________
private void releaseResources()
- { m_oDaoIndex = null;
+ { 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();
@@ -267,6 +290,7 @@
// 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); }
@@ -275,12 +299,13 @@
} //__________________________________
/**
* @ejb.interface-method
- * @param p_iStore
+ * view-type="both"
+ * @param p_sClassName
* @param p_lUid
* @throws Exception
*/
- public void rmvObject(Class pCls, long p_lUid) throws Exception
- { try { doRmvSnapshot(BobjStore.getStore(pCls), p_lUid); m_oDataConn.commit(); }
+ 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) {}
@@ -289,81 +314,54 @@
finally { releaseResources(); }
} //__________________________________
-// Public local interface
/**
* @ejb.interface-method
- * view-type = "local"
+ * view-type="both"
*/
- public long addObject (BaseBusinessObject p_oBO) throws Exception
- { try
- { long lUid = doAddSnapshot (p_oBO);
- m_oDataConn.commit();
- return lUid;
- }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type = "local"
- * @param p_iStore
- * @param p_lUid
- * @return
- * @throws Exception
- */
- public BaseBusinessObject getObject(Class pCls, long p_lUid) throws Exception
- { return BaseBusinessObject.getFromDTO(getDTO(pCls, p_lUid));
- } //__________________________________
-/**
- * @ejb.interface-method
- * view-type = "local"
- * @param p_o
- * @throws Exception
- */
- public void rplObject(BaseBusinessObject p_o) throws Exception
- { try { doRplSnapshot(p_o); m_oDataConn.commit(); }
- catch (Exception e)
- { try { if (null != m_oDataConn) m_oDataConn.rollback(); }
- catch (Exception eRoll) {}
- throw e;
- }
- finally { releaseResources(); }
- } //__________________________________
-
-// Public remote interface
-/**
- * @ejb.interface-method
- * view-type = "remote"
- */
public long addDTO(BobjStdDTO p_oDto) throws Exception
- { BaseBusinessObject oBO = BaseBusinessObject.getFromDTO(p_oDto);
- return addObject (oBO);
+ { 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 = "remote"
- * @param p_iStore
+ * view-type="both"
+ * @param p_sClassName - String Fully qualified name of class to be retrieved
* @param p_lUid
* @return
* @throws Exception
*/
- public BobjStdDTO getDTO (Class pCls, long p_lUid) throws Exception
- { try { return doGetSnapshot(BobjStore.getStore(pCls), p_lUid);}
+ 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 = "remote"
- * @param p_oDto
+ * view-type="both"
+ *
+ * @param p_oDto BobjStdDTO - Serialized BaseBusinessObject that has to be replaced
* @throws Exception
*/
public void rplDTO(BobjStdDTO p_oDto) throws Exception
- { rplObject(BaseBusinessObject.getFromDTO(p_oDto));
+ { 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(); }
} //__________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocal.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
@@ -16,12 +16,12 @@
public long getUidChunk( int p_iQ ) throws java.lang.Exception;
- public void rmvObject( java.lang.Class pCls,long p_lUid ) throws java.lang.Exception;
+ public void rmvObject( java.lang.String p_sClassName,long p_lUid ) throws java.lang.Exception;
- public long addObject( org.jboss.soa.esb.util.BaseBusinessObject p_oBO ) 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.BaseBusinessObject getObject( java.lang.Class pCls,long p_lUid ) 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 rplObject( org.jboss.soa.esb.util.BaseBusinessObject p_o ) throws java.lang.Exception;
+ public void rplDTO( org.jboss.soa.esb.util.BobjStdDTO p_oDto ) throws java.lang.Exception;
}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerLocalHome.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -5,7 +5,7 @@
/**
* Local home interface for JbossEsbPersistHandler.
- * @xdoclet-generated at July 4 2006
+ * @xdoclet-generated at July 12 2006
* @copyright The XDoclet Team
* @author XDoclet
* @version ${version}
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateLocal.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -47,21 +47,22 @@
{ return m_oSnapH.getUidChunk(p_iQ);
} //__________________________________
public long addObject (BobjStdDTO p_oDto) throws Exception
- { return m_oSnapH.addObject(BaseBusinessObject.getFromDTO(p_oDto));
+ { return m_oSnapH.addDTO(p_oDto);
} //__________________________________
public long addObject (BaseBusinessObject p_oBo) throws Exception
{ p_oBo.setPackage();
- return m_oSnapH.addObject(p_oBo);
+ return m_oSnapH.addDTO(p_oBo.toDTO());
} //__________________________________
public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
- { return m_oSnapH.getObject(p_oCls,p_lUid);
+ { BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls.getName(), p_lUid);
+ return (null==oDto)?null:BaseBusinessObject.getFromDTO(oDto);
} //__________________________________
public void rmvObject (Class p_oCls, long p_lUid) throws Exception
- { m_oSnapH.rmvObject(p_oCls, p_lUid);
+ { m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
} //__________________________________
public void rplObject (BaseBusinessObject p_o) throws Exception
{ p_o.setPackage();
- m_oSnapH.rplObject(p_o);
+ m_oSnapH.rplDTO(p_o.toDTO());
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
{
Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-07-12 14:49:00 UTC (rev 5041)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/PersistHandlerBsDelegateRemote.java 2006-07-12 14:52:00 UTC (rev 5042)
@@ -50,20 +50,24 @@
public long addObject (BaseBusinessObject p_oBo) throws Exception
{ if (null==p_oBo) return -1;
p_oBo.setPackage();
- return m_oSnapH.addDTO(p_oBo.toDTO());
+ BobjStdDTO oDto = p_oBo.toDTO();
+ oDto.setLocators(p_oBo.allLocators());
+ return m_oSnapH.addDTO(oDto);
} //__________________________________
public BaseBusinessObject getObject (Class p_oCls, long p_lUid) throws Exception
{
- BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls, p_lUid);
+ BobjStdDTO oDto = m_oSnapH.getDTO(p_oCls.getName(), p_lUid);
return (null==oDto)?null:BaseBusinessObject.getFromDTO(oDto);
} //__________________________________
public void rmvObject (Class p_oCls, long p_lUid) throws Exception
- { m_oSnapH.rmvObject(p_oCls, p_lUid);
+ { m_oSnapH.rmvObject(p_oCls.getName(), p_lUid);
} //__________________________________
- public void rplObject (BaseBusinessObject p_o) throws Exception
- { if (null==p_o) return;
- p_o.setPackage();
- m_oSnapH.rplDTO(p_o.toDTO());
+ public void rplObject (BaseBusinessObject p_oBo) throws Exception
+ { if (null==p_oBo) return;
+ p_oBo.setPackage();
+ BobjStdDTO oDto = p_oBo.toDTO();
+ oDto.setLocators(p_oBo.allLocators());
+ m_oSnapH.rplDTO(oDto);
} //__________________________________
public ObjLocator[] getLocatorList(Class p_oCls, Properties p_oProp)
More information about the jboss-svn-commits
mailing list