Author: ruwan
Date: Mon Apr 26 17:43:48 2010
New Revision: 938148
URL: http://svn.apache.org/viewvc?rev=938148&view=rev
Log:
Refactoring the datasources
Added:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryHolder.java
- copied, changed from r938128,
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java
Removed:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java?rev=938148&r1=938147&r2=938148&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceFinder.java
Mon Apr 26 17:43:48 2010
@@ -73,8 +73,8 @@ public class DataSourceFinder {
}
} catch (NamingException e) {
- throw new SynapseCommonsException("Error looking up DataSource : "
+ dsName + " using JNDI" +
- " properties : " + context, e, log);
+ throw new SynapseCommonsException("Error looking up DataSource : "
+ dsName
+ + " using JNDI" + " properties : " + context, e, log);
}
}
}
Copied:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryHolder.java
(from r938128,
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java)
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryHolder.java?p2=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryHolder.java&p1=synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java&r1=938128&r2=938148&rev=938148&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryHolder.java
Mon Apr 26 17:43:48 2010
@@ -26,26 +26,29 @@ import org.apache.synapse.commons.dataso
import java.util.Properties;
/**
- * Some help functions related with DataSourceInformationRepository
- * TODO - rename class name
+ * Holder for the DataSourceRepository
*/
-...@suppresswarnings("unused")
-public class DataSourceHelper {
+...@suppresswarnings({"UnusedDeclaration"})
+public class DataSourceRepositoryHolder {
- private static final Log log = LogFactory.getLog(DataSourceHelper.class);
- private final static DataSourceHelper REPOSITORY_HELPER =
- new DataSourceHelper();
+ private static final Log log =
LogFactory.getLog(DataSourceRepositoryHolder.class);
+
+ private static final DataSourceRepositoryHolder
DATA_SOURCE_REPOSITORY_HOLDER
+ = new DataSourceRepositoryHolder();
private DataSourceInformationRepository dataSourceInformationRepository;
- private boolean initialized = false;
+
private DataSourceRepositoryManager dataSourceRepositoryManager;
+
private RepositoryBasedDataSourceFinder repositoryBasedDataSourceFinder;
- private DataSourceHelper() {
+ private boolean initialized = false;
+
+ private DataSourceRepositoryHolder() {
}
- public static DataSourceHelper getInstance() {
- return REPOSITORY_HELPER;
+ public static DataSourceRepositoryHolder getInstance() {
+ return DATA_SOURCE_REPOSITORY_HOLDER;
}
/**
@@ -54,17 +57,19 @@ public class DataSourceHelper {
* @param repository to be initialized
* @param properties DataSources configuration properties
*/
- public void init(
- DataSourceInformationRepository repository,
- Properties properties) {
+ public void init(DataSourceInformationRepository repository, Properties
properties) {
if (initialized) {
if (log.isDebugEnabled()) {
- log.debug("DataSourceHelper has been already initialized.");
+ log.debug("Data source repository holder has already been
initialized.");
}
return;
}
+ if (log.isDebugEnabled()) {
+ log.debug("Initializing the data source repository holder");
+ }
+
DataSourceInformationRepositoryListener repositoryListener = null;
if (repository != null) {
repositoryListener = repository.getRepositoryListener();
@@ -104,8 +109,7 @@ public class DataSourceHelper {
private void assertInitialized() {
if (!initialized) {
- String msg = "DataSourceHelper has not been initialized, " +
- "it requires to be initialized";
+ String msg = "Data source repository holder has not been
initialized";
log.error(msg);
throw new SynapseCommonsException(msg);
}
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=938148&r1=938147&r2=938148&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:43:48 2010
@@ -35,11 +35,11 @@ import org.apache.axis2.phaseresolver.Ph
import org.apache.axis2.phaseresolver.PhaseMetadata;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.commons.datasource.DataSourceRepositoryHolder;
import org.apache.synapse.commons.util.RMIRegistryController;
import org.apache.synapse.commons.security.SecurityConstants;
import org.apache.synapse.commons.security.secret.SecretCallbackHandler;
import org.apache.synapse.commons.datasource.DataSourceInformationRepository;
-import org.apache.synapse.commons.datasource.DataSourceHelper;
import org.apache.synapse.commons.datasource.DataSourceConstants;
import org.apache.synapse.commons.jmx.JmxInformation;
import org.apache.synapse.commons.jmx.JmxInformationFactory;
@@ -660,21 +660,21 @@ public class Axis2SynapseController impl
}
/**
- * Initiating DataSourceHelper with a new datasource information
repository or
+ * Initiating DataSourceRepositoryHolder with a new datasource information
repository or
* reusing an existing repository.
*
* @param serverContextInformation ServerContextInformation instance
*/
private void initDataSourceHelper(ServerContextInformation
serverContextInformation) {
- DataSourceHelper helper = DataSourceHelper.getInstance();
+ DataSourceRepositoryHolder repositoryHolder =
DataSourceRepositoryHolder.getInstance();
Properties synapseProperties =
SynapsePropertiesLoader.reloadSynapseProperties();
Object repo =
serverContextInformation.getProperty(
DataSourceConstants.DATA_SOURCE_INFORMATION_REPOSITORY);
if (repo instanceof DataSourceInformationRepository) {
- helper.init((DataSourceInformationRepository) repo,
synapseProperties);
+ repositoryHolder.init((DataSourceInformationRepository) repo,
synapseProperties);
} else {
- helper.init(null, synapseProperties);
+ repositoryHolder.init(null, synapseProperties);
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=938148&r1=938147&r2=938148&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Mon Apr 26 17:43:48 2010
@@ -24,8 +24,8 @@ import org.apache.axis2.engine.AxisConfi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.*;
+import org.apache.synapse.commons.datasource.DataSourceRepositoryHolder;
import org.apache.synapse.eventing.SynapseEventSource;
-import org.apache.synapse.commons.datasource.DataSourceHelper;
import org.apache.synapse.commons.executors.PriorityExecutor;
import org.apache.synapse.config.xml.MediatorFactoryFinder;
import org.apache.synapse.config.xml.endpoints.XMLToEndpointMapper;
@@ -981,7 +981,7 @@ public class SynapseConfiguration implem
// clear session information used for SA load balancing
try {
SALSessions.getInstance().reset();
-
DataSourceHelper.getInstance().getDataSourceRepositoryManager().clear();
+
DataSourceRepositoryHolder.getInstance().getDataSourceRepositoryManager().clear();
} catch (Throwable ignored) {}
// destroy the priority executors.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java?rev=938148&r1=938147&r2=938148&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/AbstractDBMediator.java
Mon Apr 26 17:43:48 2010
@@ -347,7 +347,7 @@ public abstract class AbstractDBMediator
private DataSource lookupDataSource(String dataSourceName, Properties
jndiProperties) {
DataSource dataSource = null;
- RepositoryBasedDataSourceFinder finder = DataSourceHelper.getInstance()
+ RepositoryBasedDataSourceFinder finder =
DataSourceRepositoryHolder.getInstance()
.getRepositoryBasedDataSourceFinder();
if (finder.isInitialized()) {
