Author: indika
Date: Thu Mar 26 08:57:20 2009
New Revision: 758564
URL: http://svn.apache.org/viewvc?rev=758564&view=rev
Log:
a minor refactor datasources - move code
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/JNDIBasedDataSourceRepository.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.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=758564&r1=758563&r2=758564&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
Thu Mar 26 08:57:20 2009
@@ -19,7 +19,10 @@
package org.apache.synapse.commons.util.datasource;
import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.synapse.commons.util.secret.SecretCallback;
import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
+import org.apache.synapse.commons.util.secret.SecretLoadingModule;
+import org.apache.synapse.commons.util.secret.SingleSecretCallback;
import java.util.HashMap;
import java.util.Map;
@@ -33,7 +36,7 @@
public static final String BASIC_DATA_SOURCE = "BasicDataSource";
public static final String PER_USER_POOL_DATA_SOURCE =
"PerUserPoolDataSource";
private String user;
- private String password;
+ private String aliasPassword;
private String datasourceName;
private int maxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE;
private int maxIdle = GenericObjectPool.DEFAULT_MAX_IDLE;
@@ -157,12 +160,35 @@
this.user = user;
}
- public String getPassword() {
- return password;
+ public String getAliasPassword() {
+ return aliasPassword;
}
- public void setPassword(String password) {
- this.password = password;
+ /**
+ * Get actual password based on SecretCallbackHandler and alias password
+ * If SecretCallbackHandler is null, then returns alias password
+ * @return Actual password
+ */
+ public String getResolvedPassword() {
+
+ if (passwordProvider != null) {
+ if (aliasPassword != null && !"".equals(aliasPassword)) {
+
+ SecretLoadingModule secretLoadingModule = new
SecretLoadingModule();
+ secretLoadingModule.init(new
SecretCallbackHandler[]{passwordProvider});
+ SingleSecretCallback secretCallback =
+ new
SingleSecretCallback(DataSourceConfigurationConstants.PROMPT,
+ aliasPassword);
+ SecretCallback[] secretCallbacks = new
SecretCallback[]{secretCallback};
+ secretLoadingModule.load(secretCallbacks);
+ return secretCallback.getSecret();
+ }
+ }
+ return aliasPassword;
+ }
+
+ public void setAliasPassword(String aliasPassword) {
+ this.aliasPassword = aliasPassword;
}
public String getDatasourceName() {
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=758564&r1=758563&r2=758564&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
Thu Mar 26 08:57:20 2009
@@ -26,10 +26,6 @@
import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.util.RMIRegistryController;
import org.apache.synapse.commons.util.SynapseUtilException;
-import org.apache.synapse.commons.util.secret.SecretCallback;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SecretLoadingModule;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
import javax.naming.*;
import javax.sql.DataSource;
@@ -131,18 +127,7 @@
String url = information.getUrl();
String user = information.getUser();
- String password = information.getPassword();
- SecretCallbackHandler secretCallbackHandler =
information.getPasswordProvider();
- if (secretCallbackHandler != null) {
- SecretLoadingModule secretLoadingModule = new
SecretLoadingModule();
- secretLoadingModule.init(new
SecretCallbackHandler[]{secretCallbackHandler});
- SingleSecretCallback secretCallback =
- new
SingleSecretCallback(DataSourceConfigurationConstants.PROMPT,
- password);
- SecretCallback[] secretCallbacks = new
SecretCallback[]{secretCallback};
- secretLoadingModule.load(secretCallbacks);
- password = secretCallback.getSecret();
- }
+ String password = information.getResolvedPassword();
String maxActive = String.valueOf(information.getMaxActive());
String maxIdle = String.valueOf(information.getMaxIdle());
Modified:
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java?rev=758564&r1=758563&r2=758564&view=diff
==============================================================================
---
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
(original)
+++
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceFactory.java
Thu Mar 26 08:57:20 2009
@@ -24,12 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.commons.util.SynapseUtilException;
-import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
import org.apache.synapse.commons.util.datasource.DataSourceInformation;
-import org.apache.synapse.commons.util.secret.SecretCallback;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandler;
-import org.apache.synapse.commons.util.secret.SecretLoadingModule;
-import org.apache.synapse.commons.util.secret.SingleSecretCallback;
import javax.sql.DataSource;
@@ -69,19 +64,7 @@
}
String user = information.getUser();
- String password = information.getPassword();
- SecretCallbackHandler secretCallbackHandler =
information.getPasswordProvider();
-
- if (secretCallbackHandler != null) {
- SecretLoadingModule secretLoadingModule = new
SecretLoadingModule();
- secretLoadingModule.init(new
SecretCallbackHandler[]{secretCallbackHandler});
- SingleSecretCallback secretCallback =
- new
SingleSecretCallback(DataSourceConfigurationConstants.PROMPT,
- password);
- SecretCallback[] secretCallbacks = new
SecretCallback[]{secretCallback};
- secretLoadingModule.load(secretCallbacks);
- password = secretCallback.getSecret();
- }
+ String password = information.getResolvedPassword();
int defaultTransactionIsolation =
information.getDefaultTransactionIsolation();
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=758564&r1=758563&r2=758564&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
Thu Mar 26 08:57:20 2009
@@ -24,9 +24,9 @@
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.util.SynapseUtilException;
-import org.apache.synapse.commons.util.secret.SecretCallbackHandlerFactory;
import
org.apache.synapse.commons.util.datasource.DataSourceConfigurationConstants;
import org.apache.synapse.commons.util.datasource.DataSourceInformation;
+import org.apache.synapse.commons.util.secret.SecretCallbackHandlerFactory;
import java.util.Properties;
@@ -101,7 +101,7 @@
String.class);
if (password != null && !"".equals(password)) {
- information.setPassword(password);
+ information.setAliasPassword(password);
}
String dataSourceName = (String) MiscellaneousUtil.getProperty(
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=758564&r1=758563&r2=758564&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
Thu Mar 26 08:57:20 2009
@@ -52,7 +52,7 @@
addProperty(properties, prefix +
DataSourceConfigurationConstants.PROP_USER_NAME,
information.getUser());
addProperty(properties, prefix +
DataSourceConfigurationConstants.PROP_PASSWORD,
- information.getPassword());
+ information.getAliasPassword());
addProperty(properties, prefix +
DataSourceConfigurationConstants.PROP_MAXACTIVE,
String.valueOf(information.getMaxActive()));
addProperty(properties, prefix +
DataSourceConfigurationConstants.PROP_MAXIDLE,
