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 2008/11/16 12:59:15 UTC
svn commit: r718008 - in
/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource:
DataSourceInformation.java factory/DataSourceInformationFactory.java
serializer/DataSourceInformationSerializer.java
Author: indika
Date: Sun Nov 16 03:59:15 2008
New Revision: 718008
URL: http://svn.apache.org/viewvc?rev=718008&view=rev
Log:
init some variables with default values
fix some issues in ds fatory and serializer
Modified:
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/factory/DataSourceInformationFactory.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/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=718008&r1=718007&r2=718008&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 Sun Nov 16 03:59:15 2008
@@ -39,7 +39,7 @@
private long maxWait = GenericObjectPool.DEFAULT_MAX_WAIT;
private String driver;
private String url;
- private String type;
+ private String type = BASIC_DATA_SOURCE;
private boolean defaultAutoCommit = true;
private boolean defaultReadOnly = false;
private boolean testOnBorrow = true;
@@ -48,14 +48,14 @@
private int initialSize;
private int defaultTransactionIsolation = -1;
private String defaultCatalog;
- private boolean accessToUnderlyingConnectionAllowed;
- private boolean removeAbandoned;
+ private boolean accessToUnderlyingConnectionAllowed = false;
+ private boolean removeAbandoned = false;
private long removeAbandonedTimeout;
- private boolean logAbandoned;
- private boolean poolPreparedStatements;
+ private boolean logAbandoned = true;
+ private boolean poolPreparedStatements = true;
private int maxOpenPreparedStatements;
private final Properties properties = new Properties();
- private String repositoryType;
+ private String repositoryType = DataSourceConfigurationConstants.PROP_REGISTRY_MEMORY;
private String alias;
private long timeBetweenEvictionRunsMillis =
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=718008&r1=718007&r2=718008&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 Sun Nov 16 03:59:15 2008
@@ -85,13 +85,17 @@
// get other required properties
String user = (String) MiscellaneousUtil.getProperty(
- properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, "synapse", String.class);
- information.setUser(user);
+ 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, "synapse", String.class);
+ properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, null, String.class);
- information.setPassword(password);
+ if (password != null && !"".equals(password)) {
+ information.setPassword(password);
+ }
String dataSourceName = (String) MiscellaneousUtil.getProperty(
properties, prefix + DataSourceConfigurationConstants.PROP_DSNAME, dsName, String.class);
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=718008&r1=718007&r2=718008&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 Sun Nov 16 03:59:15 2008
@@ -42,7 +42,7 @@
// Prefix for getting particular data source's properties
String prefix = buffer.toString();
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_USER,
+ addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME,
information.getUser());
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD,
information.getPassword());
@@ -84,8 +84,11 @@
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION,
String.valueOf(information.getDefaultTransactionIsolation()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTCATALOG,
- String.valueOf(information.getDefaultCatalog()));
+ String defaultCatalog = information.getDefaultCatalog();
+ if (defaultCatalog != null && !"".equals(defaultCatalog)) {
+ addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTCATALOG,
+ String.valueOf(defaultCatalog));
+ }
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
String.valueOf(information.isAccessToUnderlyingConnectionAllowed()));
@@ -120,8 +123,11 @@
addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_TESTWHILEIDLE,
String.valueOf(information.isTestWhileIdle()));
- addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_VALIDATIONQUERY,
- String.valueOf(information.getValidationQuery()));
+ String validationQ = information.getValidationQuery();
+ if (validationQ != null && !"".equals(validationQ)) {
+ addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_VALIDATIONQUERY,
+ String.valueOf(validationQ));
+ }
properties.putAll(information.getAllParameters());
properties.putAll(information.getProperties());