You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/02/18 10:11:45 UTC
svn commit: r745445 - in
/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util:
./ datasource/ datasource/factory/ datasource/serializer/
Author: indika
Date: Wed Feb 18 09:11:44 2009
New Revision: 745445
URL: http://svn.apache.org/viewvc?rev=745445&view=rev
Log:
some code improvments (alignment )
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepositoryManager.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/MiscellaneousUtil.java Wed Feb 18 09:11:44 2009
@@ -70,7 +70,8 @@
* @param type Expected Type using Class
* @return Value corresponding to the given property name
*/
- public static Object getProperty(Properties properties, String name, Object defaultValue, Class type) {
+ public static Object getProperty(Properties properties, String name,
+ Object defaultValue, Class type) {
Object result = properties.getProperty(name);
if (result == null && defaultValue != null) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/PropertyHelper.java Wed Feb 18 09:11:44 2009
@@ -59,8 +59,8 @@
Class[] params = method1.getParameterTypes();
if (params.length != 1) {
handleException("Did not find a setter method named : " + mName +
- "() that takes a single String, int, long, float, double ,OMElement " +
- "or boolean parameter");
+ "() that takes a single String, int, long, float, double ," +
+ "OMElement or boolean parameter");
} else if (val instanceof String) {
String value = (String) val;
if (String.class.equals(params[0])) {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceConfigurationConstants.java Wed Feb 18 09:11:44 2009
@@ -80,8 +80,10 @@
= "org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS";
public static final String PROP_FACTORY = "factory";
public static final String PROP_NAME = "name";
- public static final String DATASOURCE_INFORMATION_REPOSITORY = "DataSourceInformationRepository";
- public static final String DEFAULT_IC_FACTORY = "com.sun.jndi.rmi.registry.RegistryContextFactory";
+ public static final String DATASOURCE_INFORMATION_REPOSITORY =
+ "DataSourceInformationRepository";
+ public static final String DEFAULT_IC_FACTORY =
+ "com.sun.jndi.rmi.registry.RegistryContextFactory";
public static final int DEFAULT_PROVIDER_PORT = 2199;
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java Wed Feb 18 09:11:44 2009
@@ -102,7 +102,8 @@
return accessToUnderlyingConnectionAllowed;
}
- public void setAccessToUnderlyingConnectionAllowed(boolean accessToUnderlyingConnectionAllowed) {
+ public void setAccessToUnderlyingConnectionAllowed(
+ boolean accessToUnderlyingConnectionAllowed) {
this.accessToUnderlyingConnectionAllowed = accessToUnderlyingConnectionAllowed;
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepository.java Wed Feb 18 09:11:44 2009
@@ -69,7 +69,8 @@
* Get a existing a DataSourceInformation instance by name
*
* @param name Name of the DataSourceInformation to be returned
- * @return DataSourceInformation instance if the are any with given name, otherwise , returns null
+ * @return DataSourceInformation instance if the are any with given name, otherwise
+ * , returns null
*/
public DataSourceInformation getDataSourceInformation(String name) {
@@ -90,7 +91,8 @@
DataSourceInformation information = dataSourceInformationMap.remove(name);
- assertNull(information, "There is no datasource information instance for given name :" + name);
+ assertNull(information, "There is no datasource information instance for given name :" +
+ name);
if (assertListerNotNull()) {
listener.removeDataSourceInformation(information);
@@ -115,7 +117,8 @@
*/
public void setRepositoryListener(DataSourceInformationRepositoryListener listener) {
- assertNull(listener, "Provided 'DataSourceInformationRepositoryListener' instance is null");
+ assertNull(listener, "Provided 'DataSourceInformationRepositoryListener' " +
+ "instance is null");
if (this.listener != null) {
handleException("There is a 'DataSourceInformationRepositoryListener' " +
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java Wed Feb 18 09:11:44 2009
@@ -44,7 +44,8 @@
public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration,
Properties properties) {
- DataSourceInformationRepository repository = getDataSourceInformationRepository(axisConfiguration);
+ DataSourceInformationRepository repository =
+ getDataSourceInformationRepository(axisConfiguration);
DataSourceInformationRepositoryListener listener = null;
if (repository != null) {
@@ -83,7 +84,8 @@
DataSourceInformationRepositoryListener listener) {
DataSourceInformationRepository repository =
- DataSourceInformationRepositoryFactory.createDataSourceInformationRepository(properties, listener);
+ DataSourceInformationRepositoryFactory.createDataSourceInformationRepository(
+ properties, listener);
Parameter parameter = new Parameter(
DataSourceConfigurationConstants.DATASOURCE_INFORMATION_REPOSITORY, repository);
try {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepositoryManager.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepositoryManager.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepositoryManager.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceRepositoryManager.java Wed Feb 18 09:11:44 2009
@@ -32,10 +32,13 @@
private static final Log log = LogFactory.getLog(DataSourceRepositoryManager.class);
- private static final DataSourceRepositoryManager DATA_SOURCE_REPOSITORY_MANAGER = new DataSourceRepositoryManager();
+ private static final DataSourceRepositoryManager DATA_SOURCE_REPOSITORY_MANAGER
+ = new DataSourceRepositoryManager();
- private static final DataSourceRepository IN_MEMORY_REPOSITORY = InMemoryDataSourceRepository.getInstance();
- private static final DataSourceRepository JNDI_REPOSITORY = JNDIBasedDataSourceRepository.getInstance();
+ private static final DataSourceRepository IN_MEMORY_REPOSITORY
+ = InMemoryDataSourceRepository.getInstance();
+ private static final DataSourceRepository JNDI_REPOSITORY
+ = JNDIBasedDataSourceRepository.getInstance();
public DataSourceRepositoryManager() {
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DatasourceMBeanRepository.java Wed Feb 18 09:11:44 2009
@@ -34,8 +34,10 @@
private final static Log log = LogFactory.getLog(DatasourceMBeanRepository.class);
- private final static Map<String, DBPoolView> dataSourcesMBeans = new HashMap<String, DBPoolView>();
- private final static DatasourceMBeanRepository DATASOURCE_M_BEAN_REPOSITORY = new DatasourceMBeanRepository();
+ private final static Map<String, DBPoolView> dataSourcesMBeans
+ = new HashMap<String, DBPoolView>();
+ private final static DatasourceMBeanRepository DATASOURCE_M_BEAN_REPOSITORY
+ = new DatasourceMBeanRepository();
private final static String MBEAN_CATEGORY_DATABASE_CONNECTION_POOL = "DatabaseConnectionPool";
private DatasourceMBeanRepository() {
@@ -65,7 +67,8 @@
public void removeMBean(String name) {
dataSourcesMBeans.remove(name);
- MBeanRegistrar.getInstance().unRegisterMBean(MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
+ MBeanRegistrar.getInstance().unRegisterMBean(MBEAN_CATEGORY_DATABASE_CONNECTION_POOL,
+ name);
}
public void clear() {
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/InMemoryDataSourceRepository.java Wed Feb 18 09:11:44 2009
@@ -39,7 +39,8 @@
private final static Log log = LogFactory.getLog(InMemoryDataSourceRepository.class);
- private static final InMemoryDataSourceRepository ourInstance = new InMemoryDataSourceRepository();
+ private static final InMemoryDataSourceRepository ourInstance
+ = new InMemoryDataSourceRepository();
private final static Map<String, DataSource> dataSources = new HashMap<String, DataSource>();
private final static MBeanRepository REPOSITORY = DatasourceMBeanRepository.getInstance();
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/JNDIBasedDataSourceRepository.java Wed Feb 18 09:11:44 2009
@@ -44,9 +44,10 @@
new JNDIBasedDataSourceRepository();
private InitialContext initialContext;
private Properties jndiProperties;
- private static final Map<String, InitialContext> perDataSourceICMap = new HashMap<String, InitialContext>();
+ private static final Map<String, InitialContext> perDataSourceICMap
+ = new HashMap<String, InitialContext>();
private static final List<String> cachedNameList = new ArrayList<String>();
-
+
private boolean initialized = false;
public static JNDIBasedDataSourceRepository getInstance() {
@@ -110,7 +111,8 @@
context = initialContext;
if (log.isDebugEnabled()) {
- log.debug("Cannot create a name context with provided jndi properties : " + jndiEvn);
+ log.debug("Cannot create a name context with provided jndi properties : " +
+ jndiEvn);
log.debug("Using system-wide JNDI properties : " + jndiProperties);
}
@@ -137,7 +139,8 @@
Reference ref = new Reference("javax.sql.DataSource",
"org.apache.commons.dbcp.BasicDataSourceFactory", null);
- ref.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME, driver));
+ ref.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME,
+ driver));
ref.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_URL, url));
ref.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_USER_NAME, user));
ref.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_PASSWORD, password));
@@ -186,7 +189,8 @@
cpdsRef.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_DRIVER, driver));
cpdsRef.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_URL, url));
cpdsRef.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_USER, user));
- cpdsRef.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_PASSWORD, password));
+ cpdsRef.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_PASSWORD,
+ password));
try {
context.rebind(name, cpdsRef);
@@ -260,7 +264,8 @@
validateDSName(dsName);
if (!cachedNameList.contains(dsName)) {
if (log.isDebugEnabled()) {
- log.debug("There is no Datasource with name " + dsName + " in JNDI Datasource Repository");
+ log.debug("There is no Datasource with name " + dsName +
+ " in JNDI Datasource Repository");
}
return null;
}
@@ -308,7 +313,8 @@
reference.add(new StringRefAddr(
DataSourceConfigurationConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
String.valueOf(information.getTimeBetweenEvictionRunsMillis())));
- reference.add(new StringRefAddr(DataSourceConfigurationConstants.PROP_NUMTESTSPEREVICTIONRUN,
+ reference.add(new StringRefAddr(
+ DataSourceConfigurationConstants.PROP_NUMTESTSPEREVICTIONRUN,
String.valueOf(information.getNumTestsPerEvictionRun())));
reference.add(new StringRefAddr(
DataSourceConfigurationConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
@@ -331,7 +337,8 @@
* @param ref The naming reference instance
* @param information DataSourceInformation instance
*/
- private static void setBasicDataSourceParameters(Reference ref, DataSourceInformation information) {
+ private static void setBasicDataSourceParameters(Reference ref,
+ DataSourceInformation information) {
int defaultTransactionIsolation = information.getDefaultTransactionIsolation();
String defaultCatalog = information.getDefaultCatalog();
@@ -363,7 +370,7 @@
String.valueOf(information.getMaxOpenPreparedStatements())));
ref.add(new StringRefAddr(
DataSourceConfigurationConstants.PROP_INITIALSIZE, String.valueOf(
- information.getInitialSize())));
+ information.getInitialSize())));
if (defaultCatalog != null && !"".equals(defaultCatalog)) {
ref.add(new StringRefAddr
@@ -431,7 +438,8 @@
//Provider URL
providerUrl = MiscellaneousUtil.getProperty(
- dsProperties, rootPrefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL, null);
+ dsProperties, rootPrefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL,
+ null);
providerPort =
MiscellaneousUtil.getProperty(dsProperties, rootPrefix +
DataSourceConfigurationConstants.PROP_PROVIDER_PORT,
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java Wed Feb 18 09:11:44 2009
@@ -48,7 +48,8 @@
* @param properties Properties to create and configure DataSource
* @return DataSourceInformation instance
*/
- public static DataSourceInformation createDataSourceInformation(String dsName, Properties properties) {
+ public static DataSourceInformation createDataSourceInformation(String dsName,
+ Properties properties) {
if (dsName == null || "".equals(dsName)) {
if (log.isDebugEnabled()) {
@@ -69,13 +70,15 @@
String driver = MiscellaneousUtil.getProperty(
properties, prefix + DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME, null);
if (driver == null) {
- handleException(prefix + DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME + " cannot be found.");
+ handleException(prefix + DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME +
+ " cannot be found.");
}
String url = MiscellaneousUtil.getProperty(properties,
prefix + DataSourceConfigurationConstants.PROP_URL, null);
if (url == null) {
- handleException(prefix + DataSourceConfigurationConstants.PROP_URL + " cannot be found.");
+ handleException(prefix + DataSourceConfigurationConstants.PROP_URL +
+ " cannot be found.");
}
DataSourceInformation information = new DataSourceInformation();
@@ -86,20 +89,23 @@
// get other required properties
String user = (String) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, null, String.class);
+ properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, null,
+ String.class);
if (user != null && !"".equals(user)) {
information.setUser(user);
}
String password = (String) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, null, String.class);
+ properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, null,
+ String.class);
if (password != null && !"".equals(password)) {
information.setPassword(password);
}
String dataSourceName = (String) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_DSNAME, dsName, String.class);
+ properties, prefix + DataSourceConfigurationConstants.PROP_DSNAME, dsName,
+ String.class);
information.setDatasourceName(dataSourceName);
String dsType = (String) MiscellaneousUtil.getProperty(
@@ -132,32 +138,39 @@
// Construct DriverAdapterCPDS reference
String suffix = DataSourceConfigurationConstants.PROP_CPDSADAPTER +
- DataSourceConfigurationConstants.DOT_STRING + DataSourceConfigurationConstants.PROP_CLASS_NAME;
+ DataSourceConfigurationConstants.DOT_STRING +
+ DataSourceConfigurationConstants.PROP_CLASS_NAME;
String className = MiscellaneousUtil.getProperty(properties, prefix + suffix,
DataSourceConfigurationConstants.PROP_CPDSADAPTER_DRIVER);
information.addParameter(suffix, className);
suffix = DataSourceConfigurationConstants.PROP_CPDSADAPTER +
- DataSourceConfigurationConstants.DOT_STRING + DataSourceConfigurationConstants.PROP_FACTORY;
+ DataSourceConfigurationConstants.DOT_STRING +
+ DataSourceConfigurationConstants.PROP_FACTORY;
String factory = MiscellaneousUtil.getProperty(properties, prefix + suffix,
DataSourceConfigurationConstants.PROP_CPDSADAPTER_DRIVER);
information.addParameter(suffix, factory);
suffix = DataSourceConfigurationConstants.PROP_CPDSADAPTER +
- DataSourceConfigurationConstants.DOT_STRING + DataSourceConfigurationConstants.PROP_NAME;
+ DataSourceConfigurationConstants.DOT_STRING +
+ DataSourceConfigurationConstants.PROP_NAME;
String name = MiscellaneousUtil.getProperty(properties, prefix + suffix,
"cpds");
information.addParameter(suffix, name);
boolean defaultAutoCommit = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_DEFAULTAUTOCOMMIT, true, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_DEFAULTAUTOCOMMIT, true,
+ Boolean.class);
boolean defaultReadOnly = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_DEFAULTREADONLY, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_DEFAULTREADONLY, false,
+ Boolean.class);
boolean testOnBorrow = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_TESTONBORROW, true, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_TESTONBORROW, true,
+ Boolean.class);
boolean testOnReturn = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_TESTONRETURN, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_TESTONRETURN, false,
+ Boolean.class);
long timeBetweenEvictionRunsMillis = (Long) MiscellaneousUtil.getProperty(properties,
prefix + DataSourceConfigurationConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
@@ -172,40 +185,50 @@
GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS, Long.class);
boolean testWhileIdle = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_TESTWHILEIDLE, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_TESTWHILEIDLE, false,
+ Boolean.class);
String validationQuery = MiscellaneousUtil.getProperty(properties,
prefix + DataSourceConfigurationConstants.PROP_VALIDATIONQUERY, null);
int minIdle = (Integer) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_MINIDLE, GenericObjectPool.DEFAULT_MIN_IDLE,
+ prefix + DataSourceConfigurationConstants.PROP_MINIDLE,
+ GenericObjectPool.DEFAULT_MIN_IDLE,
Integer.class);
int initialSize = (Integer) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_INITIALSIZE, 0, Integer.class);
+ properties, prefix + DataSourceConfigurationConstants.PROP_INITIALSIZE, 0,
+ Integer.class);
int defaultTransactionIsolation = (Integer) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION, -1, Integer.class);
+ prefix + DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION, -1,
+ Integer.class);
String defaultCatalog = MiscellaneousUtil.getProperty(
properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTCATALOG, null);
boolean accessToUnderlyingConnectionAllowed =
(Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+ prefix +
+ DataSourceConfigurationConstants.
+ PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
false, Boolean.class);
boolean removeAbandoned = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONED, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONED, false,
+ Boolean.class);
int removeAbandonedTimeout = (Integer) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONEDTIMEOUT, 300, Integer.class);
+ prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONEDTIMEOUT, 300,
+ Integer.class);
boolean logAbandoned = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_LOGABANDONED, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_LOGABANDONED, false,
+ Boolean.class);
boolean poolPreparedStatements = (Boolean) MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConfigurationConstants.PROP_POOLPREPAREDSTATEMENTS, false, Boolean.class);
+ prefix + DataSourceConfigurationConstants.PROP_POOLPREPAREDSTATEMENTS, false,
+ Boolean.class);
int maxOpenPreparedStatements = (Integer) MiscellaneousUtil.getProperty(properties,
prefix + DataSourceConfigurationConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
@@ -244,11 +267,13 @@
//Provider URL
information.addProperty(prefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL,
MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL, null));
+ properties, prefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL,
+ null));
information.addProperty(prefix + DataSourceConfigurationConstants.PROP_PROVIDER_PORT,
MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_PROVIDER_PORT, null));
+ properties, prefix + DataSourceConfigurationConstants.PROP_PROVIDER_PORT,
+ null));
return information;
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationListFactory.java Wed Feb 18 09:11:44 2009
@@ -29,7 +29,8 @@
import java.util.Properties;
/**
- * Contains Factory method that use to create List of DataSourceInformations - a DataSourceInformation Collection
+ * Contains Factory method that use to create List of DataSourceInformations -
+ * a DataSourceInformation Collection
*/
public class DataSourceInformationListFactory {
@@ -41,9 +42,11 @@
* @param dsProperties Datasource configuration properties
* @return A List of DataSourceInformations
*/
- public static List<DataSourceInformation> createDataSourceInformationList(Properties dsProperties) {
+ public static List<DataSourceInformation> createDataSourceInformationList(
+ Properties dsProperties) {
- final List<DataSourceInformation> dataSourceInformations = new ArrayList<DataSourceInformation>();
+ final List<DataSourceInformation> dataSourceInformations =
+ new ArrayList<DataSourceInformation>();
if (dsProperties == null) {
if (log.isDebugEnabled()) {
log.debug("DataSource properties cannot be found..");
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationRepositoryFactory.java Wed Feb 18 09:11:44 2009
@@ -38,9 +38,11 @@
* @param properties DataSource properties
* @return DataSourceInformationRepository instance
*/
- public static DataSourceInformationRepository createDataSourceInformationRepository(Properties properties) {
+ public static DataSourceInformationRepository createDataSourceInformationRepository(
+ Properties properties) {
- return createDataSourceInformationRepository(properties, DataSourceRepositoryManager.getInstance());
+ return createDataSourceInformationRepository(properties,
+ DataSourceRepositoryManager.getInstance());
}
/**
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationListSerializer.java Wed Feb 18 09:11:44 2009
@@ -47,7 +47,8 @@
properties.putAll(DataSourceInformationSerializer.serialize(information));
}
}
- properties.put(DataSourceConfigurationConstants.PROP_SYNAPSE_DATASOURCES, dataSources.toString());
+ properties.put(DataSourceConfigurationConstants.PROP_SYNAPSE_DATASOURCES,
+ dataSources.toString());
return properties;
}
}
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java?rev=745445&r1=745444&r2=745445&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java Wed Feb 18 09:11:44 2009
@@ -88,7 +88,8 @@
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_INITIALSIZE,
String.valueOf(information.getInitialSize()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION,
String.valueOf(information.getDefaultTransactionIsolation()));
String defaultCatalog = information.getDefaultCatalog();
@@ -97,34 +98,41 @@
String.valueOf(defaultCatalog));
}
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
String.valueOf(information.isAccessToUnderlyingConnectionAllowed()));
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONED,
String.valueOf(information.isRemoveAbandoned()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_REMOVEABANDONEDTIMEOUT,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_REMOVEABANDONEDTIMEOUT,
String.valueOf(information.getRemoveAbandonedTimeout()));
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_LOGABANDONED,
String.valueOf(information.isLogAbandoned()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_POOLPREPAREDSTATEMENTS,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_POOLPREPAREDSTATEMENTS,
String.valueOf(information.isPoolPreparedStatements()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
String.valueOf(information.getMaxOpenPreparedStatements()));
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_REGISTRY,
String.valueOf(information.getRepositoryType()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
String.valueOf(information.getTimeBetweenEvictionRunsMillis()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_NUMTESTSPEREVICTIONRUN,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_NUMTESTSPEREVICTIONRUN,
String.valueOf(information.getNumTestsPerEvictionRun()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
+ addProperty(properties, prefix +
+ DataSourceConfigurationConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
String.valueOf(information.getMinEvictableIdleTimeMillis()));
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_TESTWHILEIDLE,