Author: ruwan
Date: Mon Apr 26 17:22:46 2010
New Revision: 938131
URL: http://svn.apache.org/viewvc?rev=938131&view=rev
Log:
Fixing the constants names on the data sources
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java?rev=938131&r1=938130&r2=938131&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceConstants.java
Mon Apr 26 17:22:46 2010
@@ -24,63 +24,118 @@ package org.apache.synapse.commons.datas
public class DataSourceConstants {
public static final String PROP_SYNAPSE_PREFIX_DS = "synapse.datasources";
+
public static final String PROP_DRIVER_CLS_NAME = "driverClassName";
- public static final String PROP_DSNAME = "dsName";
+
+ public static final String PROP_DS_NAME = "dsName";
+
public static final String PROP_URL = "url";
+
public static final String PROP_DRIVER = "driver";
+
public static final String PROP_USER = "user";
- public static final String PROP_CPDSADAPTER = "cpdsadapter";
+
+ public static final String PROP_CPDS_ADAPTER = "cpdsadapter";
+
public static final String PROP_JNDI_ENV = "jndiEnvironment";
- public static final String PROP_DEFAULTMAXACTIVE = "defaultMaxActive";
- public static final String PROP_DEFAULTMAXIDLE = "defaultMaxIdle";
- public static final String PROP_DEFAULTMAXWAIT = "defaultMaxWait";
+
+ public static final String PROP_DEFAULT_MAX_ACTIVE = "defaultMaxActive";
+
+ public static final String PROP_DEFAULT_MAX_IDLE = "defaultMaxIdle";
+
+ public static final String PROP_DEFAULT_MAX_WAIT = "defaultMaxWait";
+
public static final String PROP_DATA_SOURCE_NAME = "dataSourceName";
+
public static final String PROP_CPDS_CLASS_NAME = "className";
+
public static final String PROP_CPDS_FACTORY = "factory";
+
public static final String PROP_CPDS_NAME = "name";
- public final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
- public final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
- public final static String PROP_TESTONBORROW = "testOnBorrow";
- public final static String PROP_TESTONRETURN = "testOnReturn";
- public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS =
- "timeBetweenEvictionRunsMillis";
- public final static String PROP_NUMTESTSPEREVICTIONRUN =
"numTestsPerEvictionRun";
- public final static String PROP_MINEVICTABLEIDLETIMEMILLIS =
"minEvictableIdleTimeMillis";
- public final static String PROP_TESTWHILEIDLE = "testWhileIdle";
- public final static String PROP_VALIDATIONQUERY = "validationQuery";
- public final static String PROP_MAXACTIVE = "maxActive";
- public final static String PROP_MAXIDLE = "maxIdle";
- public final static String PROP_MAXWAIT = "maxWait";
- public final static String PROP_MINIDLE = "minIdle";
- public final static String PROP_INITIALSIZE = "initialSize";
- public final static String PROP_DEFAULTTRANSACTIONISOLATION =
"defaultTransactionIsolation";
- public final static String PROP_DEFAULTCATALOG = "defaultCatalog";
- public final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED =
- "accessToUnderlyingConnectionAllowed";
- public final static String PROP_REMOVEABANDONED = "removeAbandoned";
- public final static String PROP_REMOVEABANDONEDTIMEOUT =
"removeAbandonedTimeout";
- public final static String PROP_LOGABANDONED = "logAbandoned";
- public final static String PROP_POOLPREPAREDSTATEMENTS =
"poolPreparedStatements";
- public final static String PROP_MAXOPENPREPAREDSTATEMENTS =
"maxOpenPreparedStatements";
+
+ public final static String PROP_DEFAULT_AUTO_COMMIT = "defaultAutoCommit";
+
+ public final static String PROP_DEFAULT_READ_ONLY = "defaultReadOnly";
+
+ public final static String PROP_TEST_ON_BORROW = "testOnBorrow";
+
+ public final static String PROP_TEST_ON_RETURN = "testOnReturn";
+
+ public final static String PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS
+ = "timeBetweenEvictionRunsMillis";
+
+ public final static String PROP_NUM_TESTS_PER_EVICTION_RUN =
"numTestsPerEvictionRun";
+
+ public final static String PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS
+ = "minEvictableIdleTimeMillis";
+
+ public final static String PROP_TEST_WHILE_IDLE = "testWhileIdle";
+
+ public final static String PROP_VALIDATION_QUERY = "validationQuery";
+
+ public final static String PROP_MAX_ACTIVE = "maxActive";
+
+ public final static String PROP_MAX_IDLE = "maxIdle";
+
+ public final static String PROP_MAX_WAIT = "maxWait";
+
+ public final static String PROP_MIN_IDLE = "minIdle";
+
+ public final static String PROP_INITIAL_SIZE = "initialSize";
+
+ public final static String PROP_DEFAULT_TRANSACTION_ISOLATION
+ = "defaultTransactionIsolation";
+
+ public final static String PROP_DEFAULT_CATALOG = "defaultCatalog";
+
+ public final static String PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED
+ = "accessToUnderlyingConnectionAllowed";
+
+ public final static String PROP_REMOVE_ABANDONED = "removeAbandoned";
+
+ public final static String PROP_REMOVE_ABANDONED_TIMEOUT =
"removeAbandonedTimeout";
+
+ public final static String PROP_LOG_ABANDONED = "logAbandoned";
+
+ public final static String PROP_POOL_PREPARED_STATEMENTS =
"poolPreparedStatements";
+
+ public final static String PROP_MAX_OPEN_PREPARED_STATEMENTS =
"maxOpenPreparedStatements";
+
public static final String PROP_PROVIDER_PORT = "providerPort";
+
public final static String PROP_REGISTRY = "registry";
+
public final static String PROP_REGISTRY_MEMORY = "memory";
+
public final static String PROP_REGISTRY_JNDI = "JNDI";
- public static final String PROP_ICFACTORY = "icFactory";
+
+ public static final String PROP_IC_FACTORY = "icFactory";
+
public static final String PROP_PROVIDER_URL = "providerUrl";
+
public static final String DOT_STRING = ".";
+
public static final String COMMA_STRING = ",";
+
public static final String PROP_TYPE = "type";
+
public static final String PROP_BASIC_DATA_SOURCE = "BasicDataSource";
+
public static final String PROP_CLASS_NAME = "className";
- public static final String PROP_CPDSADAPTER_DRIVER
+
+ public static final String PROP_CPDS_ADAPTER_DRIVER
= "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 DATA_SOURCE_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/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java?rev=938131&r1=938130&r2=938131&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
Mon Apr 26 17:22:46 2010
@@ -139,9 +139,9 @@ public class JNDIBasedDataSourceReposito
ref.add(new StringRefAddr(DataSourceConstants.PROP_URL, url));
ref.add(new StringRefAddr(SecurityConstants.PROP_USER_NAME, user));
ref.add(new StringRefAddr(SecurityConstants.PROP_PASSWORD,
password));
- ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXACTIVE,
maxActive));
- ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXIDLE,
maxIdle));
- ref.add(new StringRefAddr(DataSourceConstants.PROP_MAXWAIT,
maxWait));
+ ref.add(new StringRefAddr(DataSourceConstants.PROP_MAX_ACTIVE,
maxActive));
+ ref.add(new StringRefAddr(DataSourceConstants.PROP_MAX_IDLE,
maxIdle));
+ ref.add(new StringRefAddr(DataSourceConstants.PROP_MAX_WAIT,
maxWait));
// set BasicDataSource specific parameters
setBasicDataSourceParameters(ref, information);
@@ -166,15 +166,15 @@ public class JNDIBasedDataSourceReposito
// Construct DriverAdapterCPDS reference
String className = (String) information.getParameter(
- DataSourceConstants.PROP_CPDSADAPTER +
+ DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_CPDS_CLASS_NAME);
String factory = (String) information.getParameter(
- DataSourceConstants.PROP_CPDSADAPTER +
+ DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_CPDS_FACTORY);
String name = (String) information.getParameter(
- DataSourceConstants.PROP_CPDSADAPTER +
+ DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_CPDS_NAME);
@@ -207,11 +207,11 @@ public class JNDIBasedDataSourceReposito
ref.add(new StringRefAddr(
DataSourceConstants.PROP_DATA_SOURCE_NAME, name));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_DEFAULTMAXACTIVE, maxActive));
+ DataSourceConstants.PROP_DEFAULT_MAX_ACTIVE, maxActive));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_DEFAULTMAXIDLE, maxIdle));
+ DataSourceConstants.PROP_DEFAULT_MAX_IDLE, maxIdle));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_DEFAULTMAXWAIT, maxWait));
+ DataSourceConstants.PROP_DEFAULT_MAX_WAIT, maxWait));
//set default jndiProperties for reference
setCommonParameters(ref, information);
@@ -301,32 +301,32 @@ public class JNDIBasedDataSourceReposito
*/
private static void setCommonParameters(Reference reference,
DataSourceInformation information) {
- reference.add(new
StringRefAddr(DataSourceConstants.PROP_DEFAULTAUTOCOMMIT,
+ reference.add(new
StringRefAddr(DataSourceConstants.PROP_DEFAULT_AUTO_COMMIT,
String.valueOf(information.isDefaultAutoCommit())));
- reference.add(new
StringRefAddr(DataSourceConstants.PROP_DEFAULTREADONLY,
+ reference.add(new
StringRefAddr(DataSourceConstants.PROP_DEFAULT_READ_ONLY,
String.valueOf(information.isDefaultReadOnly())));
- reference.add(new StringRefAddr(DataSourceConstants.PROP_TESTONBORROW,
+ reference.add(new
StringRefAddr(DataSourceConstants.PROP_TEST_ON_BORROW,
String.valueOf(information.isTestOnBorrow())));
- reference.add(new StringRefAddr(DataSourceConstants.PROP_TESTONRETURN,
+ reference.add(new
StringRefAddr(DataSourceConstants.PROP_TEST_ON_RETURN,
String.valueOf(information.isTestOnReturn())));
reference.add(new StringRefAddr(
- DataSourceConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+ DataSourceConstants.PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS,
String.valueOf(information.getTimeBetweenEvictionRunsMillis())));
reference.add(new StringRefAddr(
- DataSourceConstants.PROP_NUMTESTSPEREVICTIONRUN,
+ DataSourceConstants.PROP_NUM_TESTS_PER_EVICTION_RUN,
String.valueOf(information.getNumTestsPerEvictionRun())));
reference.add(new StringRefAddr(
- DataSourceConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
+ DataSourceConstants.PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS,
String.valueOf(information.getMinEvictableIdleTimeMillis())));
reference.add(new StringRefAddr(
- DataSourceConstants.PROP_TESTWHILEIDLE,
+ DataSourceConstants.PROP_TEST_WHILE_IDLE,
String.valueOf(information.isTestWhileIdle())));
String validationQuery = information.getValidationQuery();
if (validationQuery != null && !"".equals(validationQuery)) {
reference.add(new StringRefAddr(
- DataSourceConstants.PROP_VALIDATIONQUERY,
validationQuery));
+ DataSourceConstants.PROP_VALIDATION_QUERY,
validationQuery));
}
}
@@ -345,35 +345,35 @@ public class JNDIBasedDataSourceReposito
if (defaultTransactionIsolation != -1) {
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_DEFAULTTRANSACTIONISOLATION,
+ DataSourceConstants.PROP_DEFAULT_TRANSACTION_ISOLATION,
String.valueOf(defaultTransactionIsolation)));
}
- ref.add(new StringRefAddr(DataSourceConstants.PROP_MINIDLE,
+ ref.add(new StringRefAddr(DataSourceConstants.PROP_MIN_IDLE,
String.valueOf(information.getMaxIdle())));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+
DataSourceConstants.PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED,
String.valueOf(information.isAccessToUnderlyingConnectionAllowed())));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_REMOVEABANDONED,
+ DataSourceConstants.PROP_REMOVE_ABANDONED,
String.valueOf(information.isRemoveAbandoned())));
- ref.add(new
StringRefAddr(DataSourceConstants.PROP_REMOVEABANDONEDTIMEOUT,
+ ref.add(new
StringRefAddr(DataSourceConstants.PROP_REMOVE_ABANDONED_TIMEOUT,
String.valueOf(information.getRemoveAbandonedTimeout())));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_LOGABANDONED,
+ DataSourceConstants.PROP_LOG_ABANDONED,
String.valueOf(information.isLogAbandoned())));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_POOLPREPAREDSTATEMENTS,
+ DataSourceConstants.PROP_POOL_PREPARED_STATEMENTS,
String.valueOf(information.isPoolPreparedStatements())));
- ref.add(new
StringRefAddr(DataSourceConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
+ ref.add(new
StringRefAddr(DataSourceConstants.PROP_MAX_OPEN_PREPARED_STATEMENTS,
String.valueOf(information.getMaxOpenPreparedStatements())));
ref.add(new StringRefAddr(
- DataSourceConstants.PROP_INITIALSIZE, String.valueOf(
+ DataSourceConstants.PROP_INITIAL_SIZE, String.valueOf(
information.getInitialSize())));
if (defaultCatalog != null && !"".equals(defaultCatalog)) {
ref.add(new StringRefAddr
- (DataSourceConstants.PROP_DEFAULTCATALOG, defaultCatalog));
+ (DataSourceConstants.PROP_DEFAULT_CATALOG,
defaultCatalog));
}
}
@@ -434,7 +434,7 @@ public class JNDIBasedDataSourceReposito
namingFactory = MiscellaneousUtil.getProperty(
- dsProperties, rootPrefix +
DataSourceConstants.PROP_ICFACTORY,
+ dsProperties, rootPrefix +
DataSourceConstants.PROP_IC_FACTORY,
DataSourceConstants.DEFAULT_IC_FACTORY);
//Provider URL
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationFactory.java?rev=938131&r1=938130&r2=938131&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationFactory.java
Mon Apr 26 17:22:46 2010
@@ -91,7 +91,7 @@ public class DataSourceInformationFactor
datasourceInformation.setUrl(url);
String dataSourceName = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_DSNAME, dsName,
+ properties, prefix + DataSourceConstants.PROP_DS_NAME, dsName,
String.class);
datasourceInformation.setDatasourceName(dataSourceName);
@@ -108,35 +108,35 @@ public class DataSourceInformationFactor
datasourceInformation.setRepositoryType(repositoryType);
Integer maxActive = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_MAXACTIVE,
+ properties, prefix + DataSourceConstants.PROP_MAX_ACTIVE,
GenericObjectPool.DEFAULT_MAX_ACTIVE, Integer.class);
datasourceInformation.setMaxActive(maxActive);
Integer maxIdle = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_MAXIDLE,
+ properties, prefix + DataSourceConstants.PROP_MAX_IDLE,
GenericObjectPool.DEFAULT_MAX_IDLE, Integer.class);
datasourceInformation.setMaxIdle(maxIdle);
Long maxWait = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_MAXWAIT,
+ properties, prefix + DataSourceConstants.PROP_MAX_WAIT,
GenericObjectPool.DEFAULT_MAX_WAIT, Long.class);
datasourceInformation.setMaxWait(maxWait);
// Construct DriverAdapterCPDS reference
- String suffix = DataSourceConstants.PROP_CPDSADAPTER +
+ String suffix = DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_CLASS_NAME;
String className = MiscellaneousUtil.getProperty(properties, prefix +
suffix,
- DataSourceConstants.PROP_CPDSADAPTER_DRIVER);
+ DataSourceConstants.PROP_CPDS_ADAPTER_DRIVER);
datasourceInformation.addParameter(suffix, className);
- suffix = DataSourceConstants.PROP_CPDSADAPTER +
+ suffix = DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_FACTORY;
String factory = MiscellaneousUtil.getProperty(properties, prefix +
suffix,
- DataSourceConstants.PROP_CPDSADAPTER_DRIVER);
+ DataSourceConstants.PROP_CPDS_ADAPTER_DRIVER);
datasourceInformation.addParameter(suffix, factory);
- suffix = DataSourceConstants.PROP_CPDSADAPTER +
+ suffix = DataSourceConstants.PROP_CPDS_ADAPTER +
DataSourceConstants.DOT_STRING +
DataSourceConstants.PROP_NAME;
String name = MiscellaneousUtil.getProperty(properties, prefix +
suffix,
@@ -144,81 +144,81 @@ public class DataSourceInformationFactor
datasourceInformation.addParameter(suffix, name);
boolean defaultAutoCommit = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_DEFAULTAUTOCOMMIT, true,
+ prefix + DataSourceConstants.PROP_DEFAULT_AUTO_COMMIT, true,
Boolean.class);
boolean defaultReadOnly = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_DEFAULTREADONLY, false,
+ prefix + DataSourceConstants.PROP_DEFAULT_READ_ONLY, false,
Boolean.class);
boolean testOnBorrow = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_TESTONBORROW, true,
+ prefix + DataSourceConstants.PROP_TEST_ON_BORROW, true,
Boolean.class);
boolean testOnReturn = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_TESTONRETURN, false,
+ prefix + DataSourceConstants.PROP_TEST_ON_RETURN, false,
Boolean.class);
long timeBetweenEvictionRunsMillis =
MiscellaneousUtil.getProperty(properties,
- prefix +
DataSourceConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+ prefix +
DataSourceConstants.PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS,
GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS,
Long.class);
int numTestsPerEvictionRun = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_NUMTESTSPEREVICTIONRUN,
+ prefix + DataSourceConstants.PROP_NUM_TESTS_PER_EVICTION_RUN,
GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN,
Integer.class);
long minEvictableIdleTimeMillis =
MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
+ prefix +
DataSourceConstants.PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS,
GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS,
Long.class);
boolean testWhileIdle = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_TESTWHILEIDLE, false,
+ prefix + DataSourceConstants.PROP_TEST_WHILE_IDLE, false,
Boolean.class);
String validationQuery = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_VALIDATIONQUERY, null);
+ prefix + DataSourceConstants.PROP_VALIDATION_QUERY, null);
int minIdle = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_MINIDLE,
+ prefix + DataSourceConstants.PROP_MIN_IDLE,
GenericObjectPool.DEFAULT_MIN_IDLE,
Integer.class);
int initialSize = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_INITIALSIZE, 0,
+ properties, prefix + DataSourceConstants.PROP_INITIAL_SIZE, 0,
Integer.class);
int defaultTransactionIsolation =
MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_DEFAULTTRANSACTIONISOLATION,
-1,
+ prefix +
DataSourceConstants.PROP_DEFAULT_TRANSACTION_ISOLATION, -1,
Integer.class);
String defaultCatalog = MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConstants.PROP_DEFAULTCATALOG,
null);
+ properties, prefix + DataSourceConstants.PROP_DEFAULT_CATALOG,
null);
boolean accessToUnderlyingConnectionAllowed =
MiscellaneousUtil.getProperty(properties,
prefix +
DataSourceConstants.
-
PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+
PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED,
false, Boolean.class);
boolean removeAbandoned = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_REMOVEABANDONED, false,
+ prefix + DataSourceConstants.PROP_REMOVE_ABANDONED, false,
Boolean.class);
int removeAbandonedTimeout = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_REMOVEABANDONEDTIMEOUT, 300,
+ prefix + DataSourceConstants.PROP_REMOVE_ABANDONED_TIMEOUT,
300,
Integer.class);
boolean logAbandoned = MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_LOGABANDONED, false,
+ prefix + DataSourceConstants.PROP_LOG_ABANDONED, false,
Boolean.class);
boolean poolPreparedStatements =
MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_POOLPREPAREDSTATEMENTS,
false,
+ prefix + DataSourceConstants.PROP_POOL_PREPARED_STATEMENTS,
false,
Boolean.class);
int maxOpenPreparedStatements =
MiscellaneousUtil.getProperty(properties,
- prefix + DataSourceConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
+ prefix + DataSourceConstants.PROP_MAX_OPEN_PREPARED_STATEMENTS,
GenericKeyedObjectPool.DEFAULT_MAX_TOTAL, Integer.class);
datasourceInformation.setDefaultAutoCommit(defaultAutoCommit);
@@ -249,9 +249,9 @@ public class DataSourceInformationFactor
}
datasourceInformation.addProperty(
- prefix + DataSourceConstants.PROP_ICFACTORY,
+ prefix + DataSourceConstants.PROP_IC_FACTORY,
MiscellaneousUtil.getProperty(
- properties, prefix +
DataSourceConstants.PROP_ICFACTORY,
+ properties, prefix +
DataSourceConstants.PROP_IC_FACTORY,
null));
//Provider URL
datasourceInformation.addProperty(
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java?rev=938131&r1=938130&r2=938131&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/serializer/DataSourceInformationSerializer.java
Mon Apr 26 17:22:46 2010
@@ -49,7 +49,7 @@ public class DataSourceInformationSerial
// Prefix for getting particular data source's properties
String prefix = buffer.toString();
- addProperty(properties, prefix + DataSourceConstants.PROP_DSNAME,
+ addProperty(properties, prefix + DataSourceConstants.PROP_DS_NAME,
information.getDatasourceName());
SecretInformation secretInformation =
information.getSecretInformation();
@@ -68,12 +68,12 @@ public class DataSourceInformationSerial
}
}
- addProperty(properties, prefix + DataSourceConstants.PROP_MAXACTIVE,
+ addProperty(properties, prefix + DataSourceConstants.PROP_MAX_ACTIVE,
String.valueOf(information.getMaxActive()));
- addProperty(properties, prefix + DataSourceConstants.PROP_MAXIDLE,
+ addProperty(properties, prefix + DataSourceConstants.PROP_MAX_IDLE,
String.valueOf(information.getMaxIdle()));
- addProperty(properties, prefix + DataSourceConstants.PROP_MAXWAIT,
+ addProperty(properties, prefix + DataSourceConstants.PROP_MAX_WAIT,
String.valueOf(information.getMaxWait()));
addProperty(properties, prefix +
DataSourceConstants.PROP_DRIVER_CLS_NAME,
@@ -85,77 +85,77 @@ public class DataSourceInformationSerial
addProperty(properties, prefix + DataSourceConstants.PROP_TYPE,
String.valueOf(information.getType()));
- addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULTAUTOCOMMIT,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULT_AUTO_COMMIT,
String.valueOf(information.isDefaultAutoCommit()));
- addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULTREADONLY,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULT_READ_ONLY,
String.valueOf(information.isDefaultReadOnly()));
- addProperty(properties, prefix + DataSourceConstants.PROP_TESTONBORROW,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_TEST_ON_BORROW,
String.valueOf(information.isTestOnBorrow()));
- addProperty(properties, prefix + DataSourceConstants.PROP_TESTONRETURN,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_TEST_ON_RETURN,
String.valueOf(information.isTestOnReturn()));
- addProperty(properties, prefix + DataSourceConstants.PROP_MINIDLE,
+ addProperty(properties, prefix + DataSourceConstants.PROP_MIN_IDLE,
String.valueOf(information.getMinIdle()));
- addProperty(properties, prefix + DataSourceConstants.PROP_INITIALSIZE,
+ addProperty(properties, prefix + DataSourceConstants.PROP_INITIAL_SIZE,
String.valueOf(information.getInitialSize()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_DEFAULTTRANSACTIONISOLATION,
+ DataSourceConstants.PROP_DEFAULT_TRANSACTION_ISOLATION,
String.valueOf(information.getDefaultTransactionIsolation()));
String defaultCatalog = information.getDefaultCatalog();
if (defaultCatalog != null && !"".equals(defaultCatalog)) {
- addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULTCATALOG,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_DEFAULT_CATALOG,
String.valueOf(defaultCatalog));
}
addProperty(properties, prefix +
- DataSourceConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+
DataSourceConstants.PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED,
String.valueOf(information.isAccessToUnderlyingConnectionAllowed()));
- addProperty(properties, prefix +
DataSourceConstants.PROP_REMOVEABANDONED,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_REMOVE_ABANDONED,
String.valueOf(information.isRemoveAbandoned()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_REMOVEABANDONEDTIMEOUT,
+ DataSourceConstants.PROP_REMOVE_ABANDONED_TIMEOUT,
String.valueOf(information.getRemoveAbandonedTimeout()));
- addProperty(properties, prefix + DataSourceConstants.PROP_LOGABANDONED,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_LOG_ABANDONED,
String.valueOf(information.isLogAbandoned()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_POOLPREPAREDSTATEMENTS,
+ DataSourceConstants.PROP_POOL_PREPARED_STATEMENTS,
String.valueOf(information.isPoolPreparedStatements()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_MAXOPENPREPAREDSTATEMENTS,
+ DataSourceConstants.PROP_MAX_OPEN_PREPARED_STATEMENTS,
String.valueOf(information.getMaxOpenPreparedStatements()));
addProperty(properties, prefix + DataSourceConstants.PROP_REGISTRY,
String.valueOf(information.getRepositoryType()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+ DataSourceConstants.PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS,
String.valueOf(information.getTimeBetweenEvictionRunsMillis()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_NUMTESTSPEREVICTIONRUN,
+ DataSourceConstants.PROP_NUM_TESTS_PER_EVICTION_RUN,
String.valueOf(information.getNumTestsPerEvictionRun()));
addProperty(properties, prefix +
- DataSourceConstants.PROP_MINEVICTABLEIDLETIMEMILLIS,
+ DataSourceConstants.PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS,
String.valueOf(information.getMinEvictableIdleTimeMillis()));
- addProperty(properties, prefix +
DataSourceConstants.PROP_TESTWHILEIDLE,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_TEST_WHILE_IDLE,
String.valueOf(information.isTestWhileIdle()));
String validationQ = information.getValidationQuery();
if (validationQ != null && !"".equals(validationQ)) {
- addProperty(properties, prefix +
DataSourceConstants.PROP_VALIDATIONQUERY,
+ addProperty(properties, prefix +
DataSourceConstants.PROP_VALIDATION_QUERY,
String.valueOf(validationQ));
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=938131&r1=938130&r2=938131&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
Mon Apr 26 17:22:46 2010
@@ -670,7 +670,7 @@ public class Axis2SynapseController impl
Properties synapseProperties =
SynapsePropertiesLoader.reloadSynapseProperties();
Object repo =
serverContextInformation.getProperty(
- DataSourceConstants.DATASOURCE_INFORMATION_REPOSITORY);
+
DataSourceConstants.DATA_SOURCE_INFORMATION_REPOSITORY);
if (repo instanceof DataSourceInformationRepository) {
helper.init((DataSourceInformationRepository) repo,
synapseProperties);
} else {
