[jboss-svn-commits] JBL Code SVN: r5511 - in labs/jbossesb/trunk/product/core: common/src/org/jboss/soa/esb/common/bizclasses common/src/org/jboss/soa/esb/connection common/src/org/jboss/soa/esb/connection/exception common/src/org/jboss/soa/esb/notification common/src/org/jboss/soa/esb/util common/tests common/tests/src/org/jboss/soa/esb/connection common/tests/src/org/jboss/soa/esb/util listeners/src/org/jboss/soa/esb/listeners processors/src/org/jboss/soa/esb/processors services/src/org/jboss/soa/esb/internal/core/objectstore services/src/org/jboss/soa/esb/services/EJB services/src/org/jboss/soa/esb/services/msglistener
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Aug 6 11:15:55 EDT 2006
Author: arvinder
Date: 2006-08-06 11:15:13 -0400 (Sun, 06 Aug 2006)
New Revision: 5511
Added:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ConnectionException.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/Util.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderTestImpl.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java
Removed:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/HashPasswordDecoder.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java
labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java
Modified:
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
labs/jbossesb/trunk/product/core/common/tests/build.xml
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java
labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
Log:
Name change EsbUtil to Util
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Address.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -72,7 +72,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
@@ -117,30 +117,30 @@
public String toString()
{ StringBuilder sb = new StringBuilder();
String sCurr = getField(ATTRIB.strNum);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sb.append(sCurr).append(" ");
ATTRIB [] oa = {ATTRIB.strLine1,ATTRIB.strLine2
,ATTRIB.twnCty1,ATTRIB.twnCty2 };
for (ATTRIB oAtt : oa)
{ sCurr = getField(oAtt);
- if(! EsbUtil.isNullString(sCurr))
+ if(! Util.isNullString(sCurr))
sb.append(sCurr.trim()).append("\n");
}
StringBuilder sZprov = new StringBuilder();
sCurr = getField(ATTRIB.postalZip);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sZprov.append(sCurr.trim()).append(" ");
sCurr = getField(ATTRIB.provSt);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sZprov.append(sCurr.trim());
if (sb.length()>0 && '\n'!=sb.charAt(-1+sb.length()))
sb.append("\n");
sb.append(sZprov);
sCurr = getField(ATTRIB.cntry);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
{ if (sb.length()>0 && '\n'!=sb.charAt(-1+sb.length()))
sb.append("\n");
sb.append(sCurr.trim());
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BankAcct.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -54,7 +54,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/BatchProcess.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -30,7 +30,7 @@
import org.jboss.soa.esb.util.BaseBusinessObject;
import org.jboss.soa.esb.util.BobjStdDTO;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
public class BatchProcess extends BaseBusinessObject {
@@ -216,7 +216,7 @@
"yyyyMMdd HH:mm:ss.S");
protected final String showStamp(ATTRIB pFld) {
- long lMillis = EsbUtil.parseLong(getField(pFld));
+ long lMillis = Util.parseLong(getField(pFld));
if (lMillis < 1)
return "";
return s_FD.format(new Date(lMillis));
@@ -247,7 +247,7 @@
if (null == pKey)
return null;
String sRet = (null == m_oData) ? null : m_oData.remove(pKey);
- if (!EsbUtil.isNullString(pVal)) {
+ if (!Util.isNullString(pVal)) {
if (null == m_oData)
m_oData = new EnumMap<ATTRIB, String>(ATTRIB.class);
m_oData.put(pKey, pVal);
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Person.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -136,7 +136,7 @@
public String setField(ATTRIB pKey, String pVal)
{ if (null==pKey) return null;
String sRet = (null==m_oData)? null : m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
{ if (null==m_oData)
m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
m_oData.put(pKey,pVal);
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/common/bizclasses/Telephone.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -55,7 +55,7 @@
{ if (null==pKey) return null;
if (null==m_oData) m_oData = new EnumMap<ATTRIB,String>(ATTRIB.class);
String sRet = m_oData.remove(pKey);
- if (! EsbUtil.isNullString(pVal))
+ if (! Util.isNullString(pVal))
m_oData.put(pKey,pVal);
return sRet;
} //__________________________________
@@ -69,20 +69,20 @@
public String toString()
{ StringBuilder sb = new StringBuilder();
String sCurr = getField(ATTRIB.cntry);
- if (! EsbUtil.isNullString(sCurr))
+ if (! Util.isNullString(sCurr))
sb.append("+").append(sCurr.trim());
sCurr = getField(ATTRIB.city);
- if(EsbUtil.isNullString(sCurr)) sb.append(" ");
+ if(Util.isNullString(sCurr)) sb.append(" ");
else
sb.append("(").append(sCurr.trim()).append(")");
sCurr = getField(ATTRIB.num);
- if(! EsbUtil.isNullString(sCurr))
+ if(! Util.isNullString(sCurr))
sb.append(sCurr.trim());
sCurr = getField(ATTRIB.ext);
- if(!EsbUtil.isNullString(sCurr))
+ if(!Util.isNullString(sCurr))
sb.append(" Ext ").append(sCurr.trim());
return sb.toString();
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/AbandonedConnectionTimerTask.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -26,7 +26,7 @@
/**
* Timer task which will run at scheduled times based on the property set by the user.
* This task will remove all unused connections which have elapsed a certain period of time
- * User: MohitK
+ * @author MohitK
* Date: Jul 26, 2006
*/
public class AbandonedConnectionTimerTask extends TimerTask {
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionFactory.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -25,8 +25,9 @@
import java.sql.SQLException;
/**
- * Factory interface for creating connections based on different sources such as DataSource, DriverConnection
- * User: MohitK
+ * Factory interface for creating connections based on different sources such as Driver, DriverManager or any
+ * third party implementation
+ * @author MohitK
* Date: Jul 18, 2006
*/
public interface ConnectionFactory {
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPool.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,23 +21,25 @@
*/
package org.jboss.soa.esb.connection;
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
+import org.jboss.soa.esb.connection.exception.ConnectionException;
import java.sql.Connection;
import java.sql.SQLException;
/**
- * TODO
- * User: MohitK
+ * Interface that needs to be implemented to provide pool of connections.
+ * @see DefaultConnectionPoolImpl
+ * Default implementation of Connection Pool
+ * @author MohitK
* Date: Jul 18, 2006
*/
public interface ConnectionPool {
/**
* This method is used to create the connection pool and keep it ready
* @param prop Properties for the connection pool including connection properties
- * @throws ESBConnectionException
+ * @throws ConnectionException
*/
- public void createPool(ConnectionProperties prop) throws ESBConnectionException;
+ public void createPool(ConnectionProperties prop) throws ConnectionException;
/**
* This method is called whenever a connection is needed from the pool.
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionPoolFactory.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,35 +21,44 @@
*/
package org.jboss.soa.esb.connection;
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.connection.exception.ConnectionException;
/**
- * Factory class to create the connection pool.
- * User: MohitK
- * Date: Jul 19, 2006
+ * Factory class which creates a connection pool. The factory also creates a JVM Shutdown hook which is called when
+ * JVM is shutting down which indirectly calls @link ConnectionPool#releasePool
+ *
+ * @author MohitK
+ * Date: Jul 19, 2006
*/
public class ConnectionPoolFactory {
+
+ private static Logger Log = Logger.getLogger(ConnectionPoolFactory.class);
+
/**
* Factory method to create and return a connection pool based on the property set for the connection pool
* implementation. The factory also registers a shut down hook with the JVM so that the connections in the pool
* are closed and released with causing connections leaks.
+ *
* @param connProperties Properties for the connection pool
* @return Connection Pool
- * @throws ESBConnectionException
+ * @throws ConnectionException
*/
- public static ConnectionPool createPool(ConnectionProperties connProperties) throws ESBConnectionException {
+ public static ConnectionPool createPool(ConnectionProperties connProperties) throws ConnectionException {
String connectionPoolClassName = connProperties.getConnectionPoolClass();
try {
- ConnectionPool pool = (ConnectionPool)Class.forName(connectionPoolClassName).newInstance();
+ ConnectionPool pool = (ConnectionPool) Class.forName(connectionPoolClassName).newInstance();
pool.createPool(connProperties);
FreeConnectionPoolResources freeResourcesThread = new FreeConnectionPoolResources(pool);
Runtime.getRuntime().addShutdownHook(freeResourcesThread);
return pool;
- } catch (Throwable t) {
- System.err.println("ConnectionPoolFactory: Error in Connection Pool");
- System.err.println(t);
- throw new ESBConnectionException(t);
+ } catch (ConnectionException e) {
+ Log.error("ConnectionPoolFactory: Error in creating Connection Pool", e);
+ throw e;
+ } catch (Throwable t){
+ Log.error("ConnectionPoolFactory: Error in Connection Pool", t);
+ throw new ConnectionException(t);
}
}
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionProperties.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,18 +21,23 @@
*/
package org.jboss.soa.esb.connection;
+import org.apache.log4j.Logger;
+
import java.util.Properties;
/**
- * Connection Property class which stores all connection and connection pool properties. It keeps the peroperties ready
+ * Connection Property class which stores all connection and connection pool properties. It keeps the properties ready
* so that is can be used by the pool and connection factory
- * User: MohitK
- * Date: Jul 18, 2006
+ *
+ * @author MohitK
+ * Date: Jul 18, 2006
*/
public class ConnectionProperties {
- private Properties _connectionProperties;
+ private static Logger Log = Logger.getLogger(ConnectionProperties.class);
+ private Properties m_oConnectionProperties;
+
public static final String DRIVER_CLASSNAME = "driver-class";
public static final String CONNECTION_URL = "connection-url";
public static final String USERNAME = "user-name";
@@ -47,18 +52,18 @@
public static final String ABANDONED_CONNECTION_TIMEOUT = "abandoned-connection-timeout";
public static final String ABANDONED_CONNECTION_CHECK_INTERVAL = "abandoned-connection-time-interval";
- private boolean _autoCommit;
- private Integer _isolationLvl;
- private int _minPoolSize;
- private int _maxPoolSize;
- private long _connBlockTime;
- private String _connectionPoolClass;
- private String _user;
- private String _password;
- private String _connectionUrl;
- private long _abandonedConnectionTimeout;
- private long _abandonedConnectionCheckInterval;
- private String _driverClassName;
+ private boolean m_bAutoCommit;
+ private Integer m_iIsolationLvl;
+ private int m_iMinPoolSize;
+ private int m_iMaxPoolSize;
+ private long m_lConnBlockTime;
+ private String m_sConnectionPoolClass;
+ private String m_sUser;
+ private String m_sPassword;
+ private String m_sConnectionUrl;
+ private long m_lAbandonedConnectionTimeout;
+ private long m_lAbandonedConnectionCheckInterval;
+ private String m_sDriverClassName;
public static final String DEFAULT_MIN_POOL_SIZE = "5";
@@ -69,7 +74,7 @@
public static final String DEFAULT_ABANDONED_CONNECTION_CHECK_INTERVAL = "30000";
public ConnectionProperties(Properties connectionProperties) {
- this._connectionProperties = connectionProperties;
+ this.m_oConnectionProperties = connectionProperties;
setDriverClassName();
setConnectionUrl();
setUser();
@@ -85,164 +90,162 @@
}
private void setDriverClassName() {
- _driverClassName = _connectionProperties.getProperty(DRIVER_CLASSNAME);
- if (_driverClassName == null) {
- _driverClassName = System.getProperty(DRIVER_CLASSNAME);
+ m_sDriverClassName = m_oConnectionProperties.getProperty(DRIVER_CLASSNAME);
+ if (m_sDriverClassName == null) {
+ m_sDriverClassName = System.getProperty(DRIVER_CLASSNAME);
}
}
protected String getDriverClassName() {
- return _driverClassName;
+ return m_sDriverClassName;
}
protected String getConnectionUrl() {
- return _connectionUrl;
+ return m_sConnectionUrl;
}
private void setConnectionUrl() {
- _connectionUrl = _connectionProperties.getProperty(CONNECTION_URL);
- if (_connectionUrl == null) {
- _connectionUrl = System.getProperty(CONNECTION_URL);
+ m_sConnectionUrl = m_oConnectionProperties.getProperty(CONNECTION_URL);
+ if (m_sConnectionUrl == null) {
+ m_sConnectionUrl = System.getProperty(CONNECTION_URL);
}
}
protected boolean getAutoCommit() {
- return _autoCommit;
+ return m_bAutoCommit;
}
protected Integer getIsolationLevel() {
- return _isolationLvl;
+ return m_iIsolationLvl;
}
private void setIsolationLevel() {
- String isolation = (String) _connectionProperties.get(ISOLATION_LEVEL);
+ String isolation = (String) m_oConnectionProperties.get(ISOLATION_LEVEL);
if (isolation == null) {
isolation = System.getProperty(ISOLATION_LEVEL);
}
- this._isolationLvl = (isolation != null) ? new Integer(isolation) : null;
+ this.m_iIsolationLvl = (isolation != null) ? new Integer(isolation) : null;
}
protected int getMinPoolSize() {
- return _minPoolSize;
+ return m_iMinPoolSize;
}
protected int getMaxPoolSize() {
- return _maxPoolSize;
+ return m_iMaxPoolSize;
}
private void setMinPoolSize() {
- String strPoolSize = _connectionProperties.getProperty(MIN_POOL_SIZE);
+ String strPoolSize = m_oConnectionProperties.getProperty(MIN_POOL_SIZE);
if (strPoolSize == null) {
strPoolSize = System.getProperty(MIN_POOL_SIZE, DEFAULT_MIN_POOL_SIZE);
- this._minPoolSize = Integer.parseInt(strPoolSize);
+ this.m_iMinPoolSize = Integer.parseInt(strPoolSize);
}
}
private void setMaxPoolSize() {
- String strPoolSize = (String) _connectionProperties.get(MAX_POOL_SIZE);
+ String strPoolSize = (String) m_oConnectionProperties.get(MAX_POOL_SIZE);
if (strPoolSize == null) {
strPoolSize = System.getProperty(MAX_POOL_SIZE, DEFAULT_MAX_POOL_SIZE);
- this._maxPoolSize = Integer.parseInt(strPoolSize);
+ this.m_iMaxPoolSize = Integer.parseInt(strPoolSize);
}
}
private void setBlockingConnectionTime() {
- String strBlockTimeMillis = (String) _connectionProperties.get(BLOCKING_CONNECTION_TIME);
+ String strBlockTimeMillis = (String) m_oConnectionProperties.get(BLOCKING_CONNECTION_TIME);
if (strBlockTimeMillis == null) {
strBlockTimeMillis = System.getProperty(BLOCKING_CONNECTION_TIME, DEFAULT_CONN_BLOCK_TIME_MILLIS);
- this._connBlockTime = Integer.parseInt(strBlockTimeMillis);
+ this.m_lConnBlockTime = Integer.parseInt(strBlockTimeMillis);
}
}
protected long getConnectionBlockTimeInMillis() {
- return _connBlockTime;
+ return m_lConnBlockTime;
}
private void setAutoCommit() {
- String autoCommit = (String) _connectionProperties.get(AUTO_COMMIT);
+ String autoCommit = (String) m_oConnectionProperties.get(AUTO_COMMIT);
if (autoCommit == null || autoCommit.equals("false")) {
- _autoCommit = Boolean.FALSE;
+ m_bAutoCommit = Boolean.FALSE;
} else {
- _autoCommit = Boolean.TRUE;
+ m_bAutoCommit = Boolean.TRUE;
}
}
private void setConnectionPoolClass() {
- _connectionPoolClass = _connectionProperties.getProperty(CONNECTION_POOL_CLASS);
- if (_connectionPoolClass == null) {
- _connectionPoolClass = System.getProperty(CONNECTION_POOL_CLASS, DEFAULT_CONNECTION_POOL_CLASS);
+ m_sConnectionPoolClass = m_oConnectionProperties.getProperty(CONNECTION_POOL_CLASS);
+ if (m_sConnectionPoolClass == null) {
+ m_sConnectionPoolClass = System.getProperty(CONNECTION_POOL_CLASS, DEFAULT_CONNECTION_POOL_CLASS);
}
}
protected String getUser() {
- return _user;
+ return m_sUser;
}
public void setUser() {
- this._user = _connectionProperties.getProperty(USERNAME);
- if (_user == null) {
- _user = System.getProperty(USERNAME);
+ this.m_sUser = m_oConnectionProperties.getProperty(USERNAME);
+ if (m_sUser == null) {
+ m_sUser = System.getProperty(USERNAME);
}
}
protected String getPassword() {
- return _password;
+ return m_sPassword;
}
protected void setPassword() {
- this._password = _connectionProperties.getProperty(PASSWORD);
- if (_password == null) {
- _password = System.getProperty(PASSWORD);
+ this.m_sPassword = m_oConnectionProperties.getProperty(PASSWORD);
+ if (m_sPassword == null) {
+ m_sPassword = System.getProperty(PASSWORD);
}
- String strPasswordDecoder = _connectionProperties.getProperty(PASSWORD_DECODER);
+ String strPasswordDecoder = m_oConnectionProperties.getProperty(PASSWORD_DECODER);
if (strPasswordDecoder == null) {
strPasswordDecoder = System.getProperty(PASSWORD_DECODER);
}
if (strPasswordDecoder != null) {
try {
PasswordDecoder decoder = (PasswordDecoder) Class.forName(strPasswordDecoder).newInstance();
- this._password = decoder.decode(_password);
+ this.m_sPassword = decoder.decode(m_sPassword);
} catch (InstantiationException e) {
- System.err.println("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder);
- System.err.println(e);
+ Log.error("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder,e);
} catch (IllegalAccessException e) {
- System.err.println("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder);
- System.err.println(e);
+ Log.error("Error in creating instance of Password Decoder Class:-" + strPasswordDecoder,e);
} catch (ClassNotFoundException e) {
- System.err.println("Password Decoder Class:-" + strPasswordDecoder + " not found in Classpath");
- System.err.println("Please check the property:-" + PASSWORD_DECODER);
- System.err.println(e);
+ Log.error("Password Decoder Class:-" + strPasswordDecoder + " not found in Classpath");
+ Log.error("Please check the property:-" + PASSWORD_DECODER);
+ Log.error(e);
}
}
}
protected String getConnectionPoolClass() {
- return _connectionPoolClass;
+ return m_sConnectionPoolClass;
}
private void setAbandonedConnectionTimeOut() {
- String strAbandonedConnectionTimeout = _connectionProperties.getProperty(ABANDONED_CONNECTION_TIMEOUT);
+ String strAbandonedConnectionTimeout = m_oConnectionProperties.getProperty(ABANDONED_CONNECTION_TIMEOUT);
if (strAbandonedConnectionTimeout == null) {
strAbandonedConnectionTimeout = System.getProperty(ABANDONED_CONNECTION_TIMEOUT, DEFAULT_ABANDONED_CONNECTION_TIMEOUT);
}
- this._abandonedConnectionTimeout = Long.parseLong(strAbandonedConnectionTimeout);
+ this.m_lAbandonedConnectionTimeout = Long.parseLong(strAbandonedConnectionTimeout);
}
private void setAbandonedConnectionCheckInterval() {
- String strAbandonedConnectionCheckInterval = _connectionProperties.getProperty(ABANDONED_CONNECTION_CHECK_INTERVAL);
+ String strAbandonedConnectionCheckInterval = m_oConnectionProperties.getProperty(ABANDONED_CONNECTION_CHECK_INTERVAL);
if (strAbandonedConnectionCheckInterval == null || strAbandonedConnectionCheckInterval.trim().length() == 0) {
strAbandonedConnectionCheckInterval = System.getProperty(ABANDONED_CONNECTION_CHECK_INTERVAL, DEFAULT_ABANDONED_CONNECTION_CHECK_INTERVAL);
}
- this._abandonedConnectionCheckInterval = Long.parseLong(strAbandonedConnectionCheckInterval);
+ this.m_lAbandonedConnectionCheckInterval = Long.parseLong(strAbandonedConnectionCheckInterval);
}
- protected long getAbandonedConnectionTimeOut(){
- return this._abandonedConnectionTimeout;
+ protected long getAbandonedConnectionTimeOut() {
+ return this.m_lAbandonedConnectionTimeout;
}
- protected long getAbandonedConnectionCheckInterval(){
- return this._abandonedConnectionCheckInterval;
+ protected long getAbandonedConnectionCheckInterval() {
+ return this.m_lAbandonedConnectionCheckInterval;
}
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/ConnectionWrapper.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -26,7 +26,7 @@
/**
* Wrapper class which encapsulates @link Connection
- * User: MohitK
+ * @author MohitK
* Date: Jul 18, 2006
*/
public class ConnectionWrapper implements Connection {
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DefaultConnectionPoolImpl.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,7 +21,8 @@
*/
package org.jboss.soa.esb.connection;
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.connection.exception.ConnectionException;
import java.sql.Connection;
import java.sql.Driver;
@@ -34,23 +35,25 @@
import java.util.concurrent.ConcurrentHashMap;
/**
- * Default connection pool implementation class when there is none specified by the user in @link ConnectionProperties
- * User: MohitK
- * Date: Jul 18, 2006
+ * Default connection pool implementation class when none is specified by the user in @link ConnectionProperties
+ *
+ * @author MohitK
+ * Date: Jul 18, 2006
*/
public class DefaultConnectionPoolImpl implements ConnectionPool {
+ private static Logger Log = Logger.getLogger(DefaultConnectionPoolImpl.class);
+
private final Stack<ConnectionWrapper> m_oConnectionStack = new Stack<ConnectionWrapper>();
private final ConcurrentHashMap<String, ConnectionWrapper> m_oUsedConnectionMap = new ConcurrentHashMap<String, ConnectionWrapper>();
private int m_iConnCountInPool;
private ConnectionProperties m_oConnProperties;
- private ConnectionFactory _connectionFactory;
+ private ConnectionFactory m_oConnectionFactory;
/**
- * @see org.jboss.soa.esb.connection.ConnectionPool#createPool(ConnectionProperties)
- *
+ * @see ConnectionPool#createPool(ConnectionProperties)
*/
- public void createPool(ConnectionProperties prop) throws ESBConnectionException {
+ public void createPool(ConnectionProperties prop) throws ConnectionException {
this.m_oConnProperties = prop;
try {
initPool();
@@ -58,21 +61,22 @@
Timer abandonedTimer = new Timer(":AbandonedConnectionPoolScheduler:@" + this.toString(), true);
abandonedTimer.schedule(abandonedConnTask, prop.getAbandonedConnectionCheckInterval(), prop.getAbandonedConnectionCheckInterval());
} catch (SQLException e) {
- throw new ESBConnectionException("DefaultConnectionPoolImpl: Error in creating Connection Pool", e);
+ Log.error("DefaultConnectionPoolImpl: Error in creating Connection Pool",e);
+ throw new ConnectionException("DefaultConnectionPoolImpl: Error in creating Connection Pool\n Reason:-" + e.getMessage(), e);
}
}
private void initPool() throws SQLException {
- if (_connectionFactory == null) {
+ if (m_oConnectionFactory == null) {
Properties properties = new Properties();
properties.put("user", m_oConnProperties.getUser());
properties.put("password", m_oConnProperties.getPassword());
- _connectionFactory = new DriverConnectionFactory(getDriver(m_oConnProperties.getDriverClassName()), m_oConnProperties.getConnectionUrl(), properties);
+ m_oConnectionFactory = new DriverConnectionFactory(getDriver(m_oConnProperties.getDriverClassName()), m_oConnProperties.getConnectionUrl(), properties);
}
while (m_iConnCountInPool < m_oConnProperties.getMinPoolSize()) {
synchronized (m_oConnectionStack) {
- m_oConnectionStack.add(new ConnectionWrapper(_connectionFactory.createConnection(), this));
+ m_oConnectionStack.add(new ConnectionWrapper(m_oConnectionFactory.createConnection(), this));
m_iConnCountInPool++;
}
}
@@ -83,8 +87,7 @@
try {
Class.forName(driverClassName);
} catch (Throwable e) {
- System.err.println("DefaultConnectionPoolImpl: Error in loading class " + driverClassName + " to create connection pool");
- System.err.println(e);
+ Log.error("DefaultConnectionPoolImpl: Error in loading class " + driverClassName + " to create connection pool", e);
throw new SQLException("DefaultConnectionPoolImpl: Error in loading class " + driverClassName + " to create connection pool");
}
return DriverManager.getDriver(m_oConnProperties.getConnectionUrl());
@@ -93,8 +96,7 @@
}
/**
- * @see org.jboss.soa.esb.connection.ConnectionPool#getConnection()
- *
+ * @see ConnectionPool#getConnection()
*/
public synchronized Connection getConnection() throws SQLException {
ConnectionWrapper newPoolConnection;
@@ -102,7 +104,7 @@
newPoolConnection = m_oConnectionStack.pop();
m_oUsedConnectionMap.put(newPoolConnection.getName(), newPoolConnection);
} else if (m_iConnCountInPool < m_oConnProperties.getMaxPoolSize()) {
- newPoolConnection = new ConnectionWrapper(_connectionFactory.createConnection(), this);
+ newPoolConnection = new ConnectionWrapper(m_oConnectionFactory.createConnection(), this);
m_oUsedConnectionMap.put(newPoolConnection.getName(), newPoolConnection);
m_iConnCountInPool++;
} else {
@@ -160,8 +162,7 @@
m_oUsedConnectionMap.remove(name);
}
} catch (SQLException e) {
- System.err.println("DefaultConnectionPoolImpl: Error in closing physical Connection");
- System.err.println(e);
+ Log.error("DefaultConnectionPoolImpl: Error in closing physical Connection", e);
}
}
@@ -172,7 +173,6 @@
/**
* This method will release all abandoned connections from the pool.
- *
*/
protected synchronized void releaseAbandonedConnections() {
@@ -183,7 +183,7 @@
long currentTime = System.currentTimeMillis();
if ((currentTime - activedTime) > m_oConnProperties.getAbandonedConnectionTimeOut()) {
try {
- System.out.println("Removing abandoned Connection:-" + connectionWrapper);
+ Log.info("Removing abandoned Connection:-" + connectionWrapper);
Connection actualConnection = connectionWrapper.getActualConnection();
m_oUsedConnectionMap.remove(connectionWrapper.getName());
connectionWrapper.setOriginalConnection(null);
@@ -193,8 +193,7 @@
m_oConnectionStack.push(connectionWrapper);
}
} catch (SQLException e) {
- System.err.println("Error in releasing abandoned connection from Pool");
- e.printStackTrace(System.err);
+ Log.error("Error in releasing abandoned connection from Pool", e);
}
}
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/DriverConnectionFactory.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -22,13 +22,13 @@
package org.jboss.soa.esb.connection;
import java.sql.Connection;
+import java.sql.Driver;
import java.sql.SQLException;
-import java.sql.Driver;
import java.util.Properties;
/**
* Driver implementation of Connection Factory
- * User: MohitK
+ * @author MohitK
* Date: Jul 18, 2006
*/
public class DriverConnectionFactory implements ConnectionFactory{
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/FreeConnectionPoolResources.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,14 +21,20 @@
*/
package org.jboss.soa.esb.connection;
+import org.apache.log4j.Logger;
+
/**
- * Shutdown Hook into the JVM. The class will be invoked by the JVM when the JVM is shutting down.
+ * Shutdown Hook into the JVM. The class will be invoked by the JVM when JVM is shutting down.
* Used to free connection resources and destroy the connection pool.
- * User: MohitK
+ * This class is will guarantee closing of all connections rather than depending on finalize method.
+ *
+ * @author MohitK
* Date: Jul 22, 2006
*/
public class FreeConnectionPoolResources extends Thread {
+ private static Logger Log = Logger.getLogger(FreeConnectionPoolResources.class);
+
ConnectionPool pool;
public FreeConnectionPoolResources(ConnectionPool pool) {
@@ -39,7 +45,7 @@
try {
pool.releasePool();
} catch (Exception e) {
- System.err.println("Error in freeing resources");
+ Log.error("Error in freeing resources");
}
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PasswordDecoder.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -24,7 +24,7 @@
/**
* Interface to be implemented by classes when they need to return the DB password for the connection by using their own
* algorithm. Called by the connection pool
- * User: MohitK
+ * @author MohitK
* Date: Jul 21, 2006
*/
public interface PasswordDecoder {
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/PoolDataSource.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -21,7 +21,8 @@
*/
package org.jboss.soa.esb.connection;
-import org.jboss.soa.esb.connection.exception.ESBConnectionException;
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.connection.exception.ConnectionException;
import javax.sql.DataSource;
import java.io.PrintWriter;
@@ -31,39 +32,41 @@
/**
* Implementation if Datasource for getting connections from pool.
- * User: MohitK
+ * @author MohitK
* Date: Jul 19, 2006
*/
public class PoolDataSource implements DataSource {
- private ConnectionPool _pool;
- private PrintWriter _logWriter = new PrintWriter(System.out);
- private int _loginTimeOut;
- private final Properties _connProps = new Properties();
- ConnectionProperties _connectionProperties;
+ private static Logger Log = Logger.getLogger(PoolDataSource.class);
+ private ConnectionPool m_oPool;
+ private PrintWriter m_oLogWriter = new PrintWriter(System.out);
+ private int m_iLoginTimeOut;
+ private final Properties m_oConnProps = new Properties();
+ ConnectionProperties m_oConnectionProperties;
+
private synchronized ConnectionPool createConnectionPool() throws SQLException {
- if (_pool == null) {
+ if (m_oPool == null) {
try {
- if (_connProps != null) {
- _connectionProperties = new ConnectionProperties(_connProps);
- _pool = ConnectionPoolFactory.createPool(_connectionProperties);
+ if (m_oConnProps != null) {
+ m_oConnectionProperties = new ConnectionProperties(m_oConnProps);
+ m_oPool = ConnectionPoolFactory.createPool(m_oConnectionProperties);
}
- } catch (ESBConnectionException e) {
- _logWriter.println("PoolDataSource: Error in creating Connection Pool");
- throw new SQLException("Error in Connection Pool Creation");
+ } catch (ConnectionException e) {
+ Log.error("PoolDataSource: Error in creating Connection Pool",e);
+ throw new SQLException(e.getMessage());
}
}
- return _pool;
+ return m_oPool;
}
public Properties getConnectionProperties() {
- return _connProps;
+ return m_oConnProps;
}
public void setConnectionProperties(Properties _connProperties) {
- _connProps.putAll(_connProperties);
+ m_oConnProps.putAll(_connProperties);
}
/**
@@ -77,9 +80,9 @@
* @see javax.sql.DataSource#getConnection(String, String)
*/
public Connection getConnection(String username, String password) throws SQLException {
- synchronized(_connProps){
- _connProps.setProperty(ConnectionProperties.USERNAME, username);
- _connProps.setProperty(ConnectionProperties.PASSWORD, password);
+ synchronized(m_oConnProps){
+ m_oConnProps.setProperty(ConnectionProperties.USERNAME, username);
+ m_oConnProps.setProperty(ConnectionProperties.PASSWORD, password);
}
return createConnectionPool().getConnection();
}
@@ -94,20 +97,20 @@
* @see javax.sql.DataSource#setLogWriter(java.io.PrintWriter)
*/
public void setLogWriter(PrintWriter out) throws SQLException {
- this._logWriter = out;
+ this.m_oLogWriter = out;
}
/**
* @see javax.sql.DataSource#setLoginTimeout(int)
*/
public void setLoginTimeout(int seconds) throws SQLException {
- this._loginTimeOut = seconds;
+ this.m_iLoginTimeOut = seconds;
}
/**
* @see javax.sql.DataSource#getLoginTimeout()
*/
public int getLoginTimeout() throws SQLException {
- return _loginTimeOut;
+ return m_iLoginTimeOut;
}
}
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ConnectionException.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/connection/exception/ConnectionException.java)
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/connection/exception/ESBConnectionException.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,45 +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.connection.exception;
-
-/**
- * This exception is thrown when Connection Pool fails to initialize
- * User: MohitK
- * Date: Jul 21, 2006
- */
-public class ESBConnectionException extends Exception{
- public ESBConnectionException() {
- super();
- }
-
- public ESBConnectionException(String message) {
- super(message);
- }
-
- public ESBConnectionException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public ESBConnectionException(Throwable cause) {
- super(cause);
- }
-}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/notification/NotifyEmail.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -28,7 +28,7 @@
import javax.mail.internet.*;
import org.jboss.soa.esb.helpers.*;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
/**
* This class will send an e-mail using the EsbEmail class
@@ -84,7 +84,7 @@
oP.setAttr(Email.MESSAGE, sMsg);
sendEmailNotification(oP);
} catch (Exception e) {
- EsbUtil.getDefaultLogger(this.getClass()).error("Send Mail Failed",
+ Util.getDefaultLogger(this.getClass()).error("Send Mail Failed",
e);
e.printStackTrace();
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BaseBusinessObject.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -76,7 +76,7 @@
if (null == pKey)
return null;
String sRet = (null == m_oData) ? null : m_oData.remove(pKey);
- if (!EsbUtil.isNullString(pVal)) {
+ if (!Util.isNullString(pVal)) {
if (null == m_oData)
m_oData = new EnumMap<ATTRIB, String>(ATTRIB.class);
m_oData.put(pKey, pVal);
@@ -254,12 +254,12 @@
if (m_lLastSnap > 0)
p_oRet.addAttr(HIDDEN.snap.toString(), Long
.toString(m_lLastSnap));
- if (!EsbUtil.isNullString(m_sDtSnap))
+ if (!Util.isNullString(m_sDtSnap))
p_oRet.addAttr(HIDDEN.dtSnap.toString(), m_sDtSnap);
if (getBatchNum() > 0)
p_oRet.addAttr(HIDDEN.batch.toString(), Long
.toString(getBatchNum()));
- if (!EsbUtil.isNullString(m_sPkg))
+ if (!Util.isNullString(m_sPkg))
p_oRet.addAttr(BobjStdDTO.BOBJ_PACKAGE, m_sPkg);
} catch (Exception e1) {
}
Modified: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/BobjStdDTO.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -189,7 +189,7 @@
private long attrAsLong(String p_s) {
try {
String sVal = getAttr(p_s);
- if (!EsbUtil.isNullString(sVal))
+ if (!Util.isNullString(sVal))
return Long.parseLong(sVal);
} catch (Exception e) {/* OK just fall through and return default */
}
@@ -436,7 +436,7 @@
public static synchronized BobjStdDTO getFromXml(String xmlBob)
throws Exception {
- if(EsbUtil.isNullString(xmlBob)) {
+ if(Util.isNullString(xmlBob)) {
throw new IllegalArgumentException("null or empty 'xmlBob' arg in call.");
}
Deleted: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/EsbUtil.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,103 +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.util;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
-import org.apache.log4j.*;
-
-public class EsbUtil {
- private EsbUtil() {
- }
-
- public static void dumpSysProps(PrintStream p_OS) {
- String[] sa = new String[System.getProperties().size()];
- System.getProperties().keySet().toArray(sa);
- Arrays.sort(sa);
- for (String sCurr : sa)
- p_OS.println(sCurr + "=" + System.getProperty(sCurr));
- } // __________________________________
-
- public static boolean isNullString(String p_s) {
- return (null == p_s) ? true : p_s.trim().length() < 1;
- } // __________________________________
-
- public static boolean isLong(String p_s) {
- if (isNullString(p_s))
- return false;
- try {
- Long.parseLong(p_s);
- return true;
- } catch (Exception e) {
- return false;
- }
- } // __________________________________
-
- public static boolean isPositiveLong(String p_s) {
- if (isNullString(p_s))
- return false;
- try {
- long lBk = Long.parseLong(p_s);
- return lBk > 0;
- } catch (Exception e) {
- return false;
- }
- } // __________________________________
-
- public static int parseInt(String s) {
- if (s == null)
- return 0;
- String sVal = s.trim();
- if (sVal.length() < 1)
- return 0;
- else
- try {
- return Integer.parseInt(s);
- } catch (NumberFormatException ex) {
- return 0;
- }
- } // __________________________________
-
- public static long parseLong(String s) {
- if (s == null)
- return 0;
- String sVal = s.trim();
- if (sVal.length() < 1)
- return 0;
- else
- try {
- return Long.parseLong(s);
- } catch (NumberFormatException ex) {
- return 0;
- }
- } // __________________________________
-
- public static Logger getDefaultLogger(Class p_oCls) {
- Logger oRet = Logger.getLogger(p_oCls.getName());
- Appender oApp = new ConsoleAppender(new TTCCLayout("ISO8601"));
- oRet.addAppender(oApp);
- return oRet;
- } // __________________________________
-
-} // ____________________________________________________________________________
Copied: labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/util/Util.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/src/org/jboss/soa/esb/util/Util.java)
Modified: labs/jbossesb/trunk/product/core/common/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-08-06 15:15:13 UTC (rev 5511)
@@ -92,6 +92,7 @@
<batchtest todir="${org.jboss.esb.tests.report.dir}">
<fileset dir="${org.jboss.esb.module.tests.src.dir}">
<include name="**/**UnitTest.java"/>
+ <exclude name="**/connection/**"/>
<include name="**/**FuncTest.java"/>
</fileset>
</batchtest>
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/AbandonedConnectionFuncTest.java)
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/ConnectionPoolFuncTest.java)
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/HashPasswordDecoder.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/HashPasswordDecoder.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/HashPasswordDecoder.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,36 +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.connection;
-
-import org.jboss.soa.esb.connection.PasswordDecoder;
-
-/**
- * TODO
- * User: MohitK
- * Date: Aug 1, 2006
- */
-public class HashPasswordDecoder implements PasswordDecoder {
-
- public String decode(String encodedPassword) {
- return "password";
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderFuncTest.java)
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderTestImpl.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/connection/PasswordDecoderTestImpl.java)
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestConnectionPool.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,104 +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.connection;
-
-import junit.framework.TestCase;
-import org.jboss.soa.esb.connection.ConnectionProperties;
-import org.jboss.soa.esb.connection.PoolDataSource;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-/**
- * TODO
- * User: MohitK
- * Date: Jul 22, 2006
- */
-public class TestConnectionPool extends TestCase {
-
- Properties properties = new Properties();
-
- protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "oracle.jdbc.driver.OracleDriver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:oracle:thin:@localhost:1521:EMS");
- properties.put(ConnectionProperties.USERNAME, "CLEARSTORY");
- properties.put(ConnectionProperties.PASSWORD, "password");
- properties.put(ConnectionProperties.ABANDONED_CONNECTION_CHECK_INTERVAL, "30000");
- }
-
-
- public void testConnectionPool() {
- PoolDataSource ds = new PoolDataSource();
- ds.setConnectionProperties(properties);
- Connection con1 = null;
- Connection con2 = null;
- Connection con3 = null;
- Connection con4 = null;
- Connection con5 = null;
- Connection con6 = null;
- Connection con7 = null;
- Connection con8 = null;
- Connection con9 = null;
- Connection con10 = null;
- Statement stat = null;
- try {
- con1 = ds.getConnection();
- con2 = ds.getConnection();
- stat = con1.createStatement();
- ResultSet rs = stat.executeQuery("select count(*) from WM_SERVER");
- while (rs.next()) {
- int count = rs.getInt(1);
- System.out.println("count = " + count);
- }
- try {
- if (stat != null) {
- stat.close();
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
- con3 = ds.getConnection();
- con4 = ds.getConnection();
- con5 = ds.getConnection();
- con6 = ds.getConnection();
- con7 = ds.getConnection();
- con8 = ds.getConnection();
- con9 = ds.getConnection();
- try {
- Thread.sleep(35000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- stat = con3.createStatement();
- stat.executeQuery("select count(*) from WM_SERVER");
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
-
-
-
-}
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/connection/TestPasswordDecoder.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,90 +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.connection;
-
-import junit.framework.TestCase;
-import org.jboss.soa.esb.connection.ConnectionProperties;
-import org.jboss.soa.esb.connection.PoolDataSource;
-import org.jboss.soa.esb.connection.HashPasswordDecoder;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Properties;
-
-/**
- * TODO
- * User: MohitK
- * Date: Aug 1, 2006
- */
-public class TestPasswordDecoder extends TestCase {
-
- Properties properties = new Properties();
-
- protected void setUp() throws Exception {
- properties.put(ConnectionProperties.DRIVER_CLASSNAME, "oracle.jdbc.driver.OracleDriver");
- properties.put(ConnectionProperties.CONNECTION_URL, "jdbc:oracle:thin:@localhost:1521:EMS");
- properties.put(ConnectionProperties.USERNAME, "CLEARSTORY");
- properties.put(ConnectionProperties.PASSWORD, "password");
- properties.setProperty(ConnectionProperties.PASSWORD_DECODER, HashPasswordDecoder.class.getName());
- }
-
- public void testPasswordDecoder() {
-
- PoolDataSource ds = new PoolDataSource();
- ds.setConnectionProperties(properties);
- Connection con1 = null;
- Statement stat = null;
- try {
- con1 = ds.getConnection();
- stat = con1.createStatement();
- ResultSet rs = stat.executeQuery("select count(*) from WM_SERVER");
- while (rs.next()) {
- int count = rs.getInt(1);
- System.out.println("count = " + count);
- }
-
-
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- } finally {
- if (stat != null) {
- try {
- stat.close();
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
- if (con1 != null) {
- try {
- con1.close();
- } catch (SQLException e) {
- e.printStackTrace();
- fail();
- }
- }
- }
- }
-}
Deleted: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/EsbUtilUnitTest.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -1,109 +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.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-/**
- * EsbUtil unit tests.
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class EsbUtilUnitTest extends TestCase {
-
- public void testDumpSysProps() throws IOException {
- ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
- EsbUtil.dumpSysProps(new PrintStream(buf));
-
- Properties props = new Properties();
- props.load(new ByteArrayInputStream(buf.toByteArray()));
-
- // Just make sure that something was dumped to the printstream
- // by checking for a property we know will be in the System...
- assertTrue(props.containsKey("file.separator"));
- }
-
- public void testIsNullString() {
- assertTrue(EsbUtil.isNullString(null));
- assertTrue(EsbUtil.isNullString(""));
- assertTrue(EsbUtil.isNullString(" "));
- assertTrue(!EsbUtil.isNullString("a"));
- }
-
- public void testIsLong() {
- assertTrue(!EsbUtil.isLong(null));
- assertTrue(!EsbUtil.isLong(""));
- assertTrue(!EsbUtil.isLong(" "));
- assertTrue(!EsbUtil.isLong("a"));
- assertTrue(!EsbUtil.isLong(" 1"));
- assertTrue(!EsbUtil.isLong("1 "));
- assertTrue(!EsbUtil.isLong("1.1"));
- assertTrue(EsbUtil.isLong("1"));
- assertTrue(EsbUtil.isLong("-1"));
- }
-
- public void testIsPositiveLong() {
- assertTrue(!EsbUtil.isPositiveLong(null));
- assertTrue(!EsbUtil.isPositiveLong(""));
- assertTrue(!EsbUtil.isPositiveLong(" "));
- assertTrue(!EsbUtil.isPositiveLong("a"));
- assertTrue(!EsbUtil.isPositiveLong(" 1"));
- assertTrue(!EsbUtil.isPositiveLong("1 "));
- assertTrue(!EsbUtil.isPositiveLong("1.1"));
- assertTrue(EsbUtil.isPositiveLong("1"));
- assertTrue(!EsbUtil.isPositiveLong("0"));
- assertTrue(!EsbUtil.isPositiveLong("-1"));
- }
-
- public void testParseInt() {
- assertEquals(0, EsbUtil.parseInt("a"));
- assertEquals(0, EsbUtil.parseInt(""));
- assertEquals(0, EsbUtil.parseInt(" "));
- assertEquals(0, EsbUtil.parseInt(" 1"));
- assertEquals(0, EsbUtil.parseInt("1 "));
- assertEquals(0, EsbUtil.parseInt("0"));
- assertEquals(1, EsbUtil.parseInt("1"));
- assertEquals(-1, EsbUtil.parseInt("-1"));
- }
-
- public void testParseLong() {
- assertEquals(0L, EsbUtil.parseLong("a"));
- assertEquals(0L, EsbUtil.parseLong(""));
- assertEquals(0L, EsbUtil.parseLong(" "));
- assertEquals(0L, EsbUtil.parseLong(" 1"));
- assertEquals(0L, EsbUtil.parseLong("1 "));
- assertEquals(0L, EsbUtil.parseLong("0"));
- assertEquals(1L, EsbUtil.parseLong("1"));
- assertEquals(-1L, EsbUtil.parseLong("-1"));
- }
-
- public void testGetDefaultLogger() {
- // Cheating here - just getting the coverage results up a little more :-)
- EsbUtil.getDefaultLogger(EsbUtil.class);
- }
-}
Copied: labs/jbossesb/trunk/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java (from rev 5510, labs/jbossesb/branches/refactor/product/core/common/tests/src/org/jboss/soa/esb/util/UtilUnitTest.java)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -78,7 +78,7 @@
protected AbstractPoller(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
m_oParmName = p_sParamsUid;
@@ -163,10 +163,10 @@
m_oTopicSubs = null;
String sStopTopic = m_oParms.getAttr(PARM_QUIESCE_TOPIC);
- if (EsbUtil.isNullString(sStopTopic))
+ if (Util.isNullString(sStopTopic))
return;
String sFactClass = m_oParms.getAttr(PARM_TOPIC_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
@@ -182,7 +182,7 @@
m_oTopicConn.start();
String sSelector = m_oParms.getAttr(PARM_QUIESCE_SELECTOR);
- if (EsbUtil.isNullString(sSelector))
+ if (Util.isNullString(sSelector))
sSelector = "processor='"+getClass().getSimpleName()+"'";
m_oTopicSubs = m_oSession.createSubscriber(m_oTopic, sSelector,true);
}
@@ -269,7 +269,7 @@
String sVal = p_oP.getAttr(p_sAtt);
if (null==sVal)
sVal = p_sDefault;
- if (EsbUtil.isNullString(sVal) && (null==p_sDefault))
+ if (Util.isNullString(sVal) && (null==p_sDefault))
throw new Exception(formatLogMsg("Missing or invalid <"+p_sAtt+"> attribute"));
return sVal;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/BetterDirListener.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -143,7 +143,7 @@
FileEndsWith(String p_sEnd) throws Exception
{
m_sSuffix = p_sEnd;
- if (EsbUtil.isNullString(m_sSuffix))
+ if (Util.isNullString(m_sSuffix))
throw new Exception("Must specify file extension");
} //_________________________________________
@@ -160,7 +160,7 @@
private DomElement m_oParms;
private Logger m_oLogger;
public FileChildProcess(Class p_oExec, Observer p_oObs, DomElement p_oP)
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oExecClass = p_oExec;
this.addObserver(p_oObs);
m_oParms = p_oP;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/JmsQueueListener.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -63,7 +63,7 @@
public JmsQueueListener(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
m_oParmName = p_sParamsUid;
@@ -136,10 +136,10 @@
m_oTopicSubs = null;
String sStopTopic = m_oParms.getAttr(PARM_QUIESCE_TOPIC);
- if (EsbUtil.isNullString(sStopTopic))
+ if (Util.isNullString(sStopTopic))
return;
String sFactClass = m_oParms.getAttr(PARM_TOPIC_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
@@ -155,7 +155,7 @@
m_oTopicConn.start();
String sSelector = m_oParms.getAttr(PARM_QUIESCE_SELECTOR);
- if (EsbUtil.isNullString(sSelector))
+ if (Util.isNullString(sSelector))
sSelector = "processor='"+getClass().getSimpleName()+"'";
m_oTopicSubs = m_oSession.createSubscriber(m_oTopic, sSelector,true);
}
@@ -320,7 +320,7 @@
String sVal = p_oP.getAttr(p_sAtt);
if (null==sVal)
sVal = p_sDefault;
- if (EsbUtil.isNullString(sVal) && (null==p_sDefault))
+ if (Util.isNullString(sVal) && (null==p_sDefault))
throw new Exception(formatLogMsg("Missing or invalid <"+p_sAtt+"> attribute"));
return sVal;
@@ -338,7 +338,7 @@
m_sSelector = obtainAtt(p_oP,LISTEN_MSG_SELECTOR,null);
String sClass = obtainAtt(p_oP,PARM_ACTION_CLASS,null);
- if (EsbUtil.isNullString(sClass))
+ if (Util.isNullString(sClass))
throw new Exception(formatLogMsg("Missing value for "+PARM_ACTION_CLASS));
m_oExecClass = Class.forName(sClass);
Constructor m_oConstructor = m_oExecClass.getConstructor
@@ -357,7 +357,7 @@
String sQueue = p_oP.getAttr(LISTEN_QUEUE);
String sFactClass = p_oP.getAttr(LISTEN_QUEUE_CONN_FACT);
- if (EsbUtil.isNullString(sFactClass))
+ if (Util.isNullString(sFactClass))
sFactClass = "ConnectionFactory";
String sJndiType = SystemProperties.getJndiServerType();
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -73,7 +73,7 @@
public OldDirListener(String p_sParamsUid) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParmRepos = ParamRepositoryFactory.getInstance();
while (loadParmsCycle(p_sParamsUid)) {}
} //__________________________________
@@ -390,7 +390,7 @@
private DomElement m_oParms;
private Logger m_oLogger;
public ChildProcess(Class p_oExec, Observer p_oObs, DomElement p_oP)
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oExecClass = p_oExec;
this.addObserver(p_oObs);
m_oParms = p_oP;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -349,7 +349,7 @@
.append(" from ") .append(m_oVals.get(TABLE_ATT.tableName.toString()));
String sAux = m_oVals.get(OPTIONAL_ATT.whereCondition.toString());
- boolean bWhere = ! EsbUtil.isNullString(sAux);
+ boolean bWhere = ! Util.isNullString(sAux);
if (bWhere)
sb.append(" where ").append(sAux);
sb.append((bWhere) ? " and " : " where ");
@@ -361,7 +361,7 @@
sAux = m_oVals.get(OPTIONAL_ATT.orderBy);
- if (! EsbUtil.isNullString(sAux))
+ if (! Util.isNullString(sAux))
sb.append(" order by ").append(sAux);
return sb.toString();
} //________________________________
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractProcessor.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -89,7 +89,7 @@
protected AbstractProcessor(DomElement p_oParms, boolean p_bLogInit) throws Exception
{
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
m_oParms = p_oParms;
try { m_oInstP = m_oParms.getFirstElementChild(PARMS_THIS_INSTANCE); }
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSaxProcessor.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -59,7 +59,7 @@
protected AbstractSaxProcessor(File p_oF, AbstractProcessor p_oProc, int p_iOutType)
throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oProcessor = p_oProc;
m_oProcessor.setOutputType(p_iOutType);
Modified: labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/processors/src/org/jboss/soa/esb/processors/AbstractSqlProcessor.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -55,7 +55,7 @@
protected AbstractSqlProcessor(File p_oF, AbstractProcessor p_oProc, int p_iOutType)
throws Exception
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
m_oProcessor= p_oProc;
m_oProcessor.setOutputType(p_iOutType);
m_oParms = m_oProcessor.cloneParams();
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/BobjStore.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -88,7 +88,7 @@
}
}
} catch (Exception e) {
- EsbUtil.getDefaultLogger(BobjStore.class).error(
+ Util.getDefaultLogger(BobjStore.class).error(
"BobjStore configuration FAILED", e);
}
@@ -207,7 +207,7 @@
} // ________________________________
private void addLocatorTable(String p_s) {
- if (EsbUtil.isNullString(p_s))
+ if (Util.isNullString(p_s))
return;
if (null == m_olLocators)
m_olLocators = new ArrayList<String>();
@@ -243,7 +243,7 @@
* @see BobjStore#getStore(BusinessObject)
*/
public static BobjStore getStore(String p_sClassName) {
- if (EsbUtil.isNullString(p_sClassName))
+ if (Util.isNullString(p_sClassName))
return null;
return s_oStoreMap.get(p_sClassName);
} // __________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoBatchTable.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -51,7 +51,7 @@
*/
public DaoBatchTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLog = Util.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
m_oaPS = new PreparedStatement[PS_MAX];
} //________________________________
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoIndexTable.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -61,7 +61,7 @@
*/
public DaoIndexTable(JdbcCleanConn p_oConn,String p_sTbl) throws Exception
{ super(p_oConn,p_sTbl);
- m_oLog = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLog = Util.getDefaultLogger(this.getClass());
m_oConn = p_oConn;
if (null != m_oaFields)
{ m_oaFields[OBJECT_UID].setPrimaryKey(true);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoSnapTable.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -27,7 +27,7 @@
import org.apache.log4j.*;
import org.jboss.soa.esb.common.*;
-import org.jboss.soa.esb.util.EsbUtil;
+import org.jboss.soa.esb.util.Util;
import org.jboss.soa.esb.util.BobjStdDTO;
import org.jboss.soa.esb.helpers.persist.*;
import org.jboss.soa.esb.services.*;
@@ -62,7 +62,7 @@
*/
public DaoSnapTable(JdbcCleanConn p_oConn,BobjStore p_oST) throws Exception
{ super(p_oConn,p_oST.getSnapTable());
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.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/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/internal/core/objectstore/DaoUidTable.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -62,7 +62,7 @@
*/
public DaoUidTable(JdbcCleanConn p_oConn,String p_sTblName) throws Exception
{ super(p_oConn,p_sTblName);
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
if (null != m_oaFields)
{ m_oaFields[UID].setPrimaryKey(true);
}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/BatchHandlerBean.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -106,7 +106,7 @@
private void getResources() throws Exception
{ Context oCtx = new InitialContext();
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.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/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/NotificationHandlerBean.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -64,7 +64,7 @@
@Init
public void ejbCreate() throws Exception
{ try
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
// Context oCtxInit =
new InitialContext();
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/EJB/PersistHandlerBean.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -74,7 +74,7 @@
@Init
public void create() throws Exception
{ try
- { m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ { m_oLogger = Util.getDefaultLogger(this.getClass());
Context oCtxInit = new InitialContext();
String sDSjndiName = BobjStore.getDataSourceJndi();
DataSource oDS = (DataSource)oCtxInit.lookup(sDSjndiName);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-06 15:03:46 UTC (rev 5510)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java 2006-08-06 15:15:13 UTC (rev 5511)
@@ -136,7 +136,7 @@
*/
public void onMessage(Message p_oMsg)
{ if (null==m_oLogger)
- m_oLogger = EsbUtil.getDefaultLogger(this.getClass());
+ m_oLogger = Util.getDefaultLogger(this.getClass());
// If the service name is null/blank then use the class name as the service name
try
{
More information about the jboss-svn-commits
mailing list