Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4834 - in labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services: EJB dbtables msglistener
|
From: <jbo...@li...> - 2006-06-26 22:35:12
|
Author: estebanschifman
Date: 2006-06-26 18:35:05 -0400 (Mon, 26 Jun 2006)
New Revision: 4834
Modified:
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/BobjStore.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
Log:
Obtain default Logger from EsbUtil
Add some logic to handle multiple locator tables in Persistence Handler
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbBatchHandlerBean.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -107,7 +107,7 @@
private void getResources() throws Exception
{ Context oCtx = new InitialContext();
- m_oLogger = Logger.getLogger(this.getClass());
+ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
m_oUidConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
m_oDataConn = new JdbcCleanConn ((DataSource)oCtx.lookup("java:JbossEsbDS"));
} //__________________________________
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbNotificationHandlerBean.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -26,6 +26,7 @@
import javax.ejb.*;
import javax.naming.*;
+import org.jboss.soa.esb.util.*;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.notification.*;
@@ -58,7 +59,7 @@
*/
public void ejbCreate() throws CreateException
{ try
- { m_oLogger = Logger.getLogger(this.getClass());
+ { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
// Context oCtxInit =
new InitialContext();
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/EJB/JbossEsbPersistHandlerBean.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -79,7 +79,7 @@
*/
public void ejbCreate() throws CreateException
{ try
- { m_oLogger = Logger.getLogger(this.getClass());
+ { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
Context oCtxInit = new InitialContext();
m_oUidConn = new JdbcCleanConn((DataSource) oCtxInit.lookup("java:RosettaDS"));
m_oDataConn = new JdbcCleanConn((DataSource) oCtxInit.lookup("java:RosettaDS"));
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/BobjStore.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/BobjStore.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/BobjStore.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -25,8 +25,6 @@
import java.util.*;
-import org.apache.log4j.*;
-
import org.jboss.soa.esb.common.*;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.util.*;
@@ -54,27 +52,30 @@
for (DomElement oCurr : oConf.getElementChildren("Class"))
{ String sClass = oCurr.getAttr("name");
boolean bCrypt = "true".equalsIgnoreCase(oCurr.getAttr("encrypt"));
- DomElement oLocator = oCurr.getFirstElementChild("Index");
- String sIndexTable = (null==oLocator)? null : oLocator.getAttr("table");
- BobjStore oNew = new BobjStore
+
+ BobjStore oNew = new BobjStore
(oCurr.getAttr("type")
,oCurr.getAttr("table")
- ,sIndexTable
+ ,null
,sClass.substring(1+sClass.lastIndexOf("."))
,bCrypt
);
+
+ for (DomElement oIcurr : oCurr.getElementChildren("Index"))
+ oNew.addLocatorTable(oIcurr.getAttr("table"));
s_oStoreMap.put(Class.forName(sClass),oNew);
}
}
}
catch (Exception e)
- { Logger.getLogger(BobjStore.class).error("BobjStore configuration FAILED"
+ { EsbUtil.getDefaultLogger(BobjStore.class).error("BobjStore configuration FAILED"
,e);
}
};
- private String m_sSnapType , m_sSnapTbl , m_sLocTbl, m_sClass;
+ private String m_sSnapType , m_sSnapTbl , m_sClass;
+ private List<String> m_olLocators;
private boolean m_bEncrypt=false;
/**
@@ -92,15 +93,24 @@
*/
public String getSnapTable() { return m_sSnapTbl; }
/**
- * Locator tablename getter - Locator table are also called index tables.
- * The value assigned to this attribute is the name of the locator table for
- * this object
- * @return String - name of SQL table where locators for objects will be stored
+ * First locator tablename getter - Locator tables are also called index tables.
+ * @return String - name of SQL table where locators(0) will be stored
* @see Istorable#getLocatorTable()
* @see BusinessObject#getObjLocator()
*/
- public String getLocatorTable() { return m_sLocTbl; }
+ public String getLocatorTable() { return getLocatorTable(0); }
/**
+ * Obtain Nth locator table
+ * @param p_n - Index for desired locator table
+ * @return String - name of Nth SQL table where for objects will be stored
+ * @see BaseBusinessObject#locator(p_i)
+ */
+ public String getLocatorTable(int p_n)
+ { return (null==m_olLocators) ? null
+ : (m_olLocators.size() <= p_n) ? null
+ : m_olLocators.get(p_n);
+ }
+ /**
* Class suffix getter - Deprecated - Left here for backwards compatibility
* @return String - Class suffix
* @see Istorable#getLocatorTable()
@@ -128,11 +138,18 @@
,String p_sCls, boolean p_bCrypt)
{ m_sSnapType = p_sSnapType;
m_sSnapTbl = p_sSnapTbl;
- m_sLocTbl = p_sLocTbl;
+ addLocatorTable(p_sLocTbl);
m_sClass = p_sCls;
m_bEncrypt = p_bCrypt;
} //________________________________
+ private void addLocatorTable(String p_s)
+ { if (EsbUtil.isNullString(p_s)) return;
+ if (null==m_olLocators)
+ m_olLocators = new ArrayList<String>();
+ m_olLocators.add(p_s);
+ } //________________________________
+
/**
* Constructor for non encrypted BobjStore
* @param p_sSnapType String
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoBatchTable.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -51,7 +51,7 @@
*/
public DaoBatchTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLog = Logger.getLogger(this.getClass());
+ m_oLog = EsbUtil.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
m_oaPS = new PreparedStatement[PS_MAX];
} //________________________________
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoIndexTable.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -41,6 +41,9 @@
*/
public class DaoIndexTable extends SqlDbTable
{
+
+ public static final String LOCATOR_TABLE_INDEX = "__whichLocator";
+
private Logger m_oLog;
private JdbcCleanConn m_oConn;
@@ -58,7 +61,7 @@
*/
public DaoIndexTable(JdbcCleanConn p_oConn,String p_sTbl) throws Exception
{ super(p_oConn,p_sTbl);
- m_oLog = Logger.getLogger(this.getClass());
+ m_oLog = EsbUtil.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
if (null != m_oaFields)
{ m_oaFields[OBJECT_UID].setPrimaryKey(true);
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoSnapTable.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -58,7 +58,7 @@
*/
public DaoSnapTable(JdbcCleanConn p_oConn,BobjStore p_oST) throws Exception
{ super(p_oConn,p_oST.getSnapTable());
- m_oLogger = Logger.getLogger(this.getClass());
+ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
m_oST = p_oST;
if (null != m_oaFields)m_oaFields[UID_SNAP].setPrimaryKey(true);
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/dbtables/DaoUidTable.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -24,6 +24,7 @@
package org.jboss.soa.esb.services.dbtables;
import org.jboss.soa.esb.helpers.persist.*;
+import org.jboss.soa.esb.util.*;
import java.sql.*;
import org.apache.log4j.*;
@@ -61,7 +62,7 @@
*/
public DaoUidTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLogger = Logger.getLogger(this.getClass());
+ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
if (null != m_oaFields)
{ m_oaFields[UID].setPrimaryKey(true);
}
Modified: labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-06-26 22:33:42 UTC (rev 4833)
+++ labs/jbossesb/trunk/ESBCore/EsbServices/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-06-26 22:35:05 UTC (rev 4834)
@@ -29,7 +29,8 @@
import javax.jms.*;
import org.apache.log4j.*;
-import org.jboss.soa.esb.common.EsbSysProps;
+import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.common.*;
import org.jboss.soa.esb.helpers.*;
import org.jboss.soa.esb.parameters.*;
@@ -135,7 +136,8 @@
* @param message Message - The JMS message that will be processed
*/
public void onMessage(Message p_oMsg)
- { if (null==m_oLogger) m_oLogger = Logger.getLogger(this.getClass());
+ { if (null==m_oLogger)
+ m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
// If the service name is null/blank then use the class name as the service name
try
{
|
