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/01/23 10:17:34 UTC
svn commit: r736975 - in
/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource:
./ factory/
Author: indika
Date: Fri Jan 23 01:17:33 2009
New Revision: 736975
URL: http://svn.apache.org/viewvc?rev=736975&view=rev
Log:
minor refactor
Modified:
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/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/DataSourceInformationRepositoryFactory.java
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=736975&r1=736974&r2=736975&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 Fri Jan 23 01:17:33 2009
@@ -35,7 +35,8 @@
private static final Log log = LogFactory.getLog(DataSourceInformationRepositoryHelper.class);
- public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration, Properties properties) {
+ public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration,
+ Properties properties) {
DataSourceInformationRepository repository = getDataSourceInformationRepository(axisConfiguration);
DataSourceInformationRepositoryListener listener = null;
@@ -58,11 +59,14 @@
}
}
- public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration, Properties properties, DataSourceInformationRepositoryListener listener) {
+ public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration,
+ Properties properties,
+ DataSourceInformationRepositoryListener listener) {
DataSourceInformationRepository repository =
DataSourceInformationRepositoryFactory.createDataSourceInformationRepository(properties, listener);
- Parameter parameter = new Parameter(DataSourceConfigurationConstants.DATASOURCE_INFORMATION_REPOSITORY, repository);
+ Parameter parameter = new Parameter(
+ DataSourceConfigurationConstants.DATASOURCE_INFORMATION_REPOSITORY, repository);
try {
axisConfiguration.addParameter(parameter);
} catch (AxisFault axisFault) {
@@ -71,9 +75,11 @@
}
}
- public static DataSourceInformationRepository getDataSourceInformationRepository(AxisConfiguration axisConfiguration) {
+ public static DataSourceInformationRepository getDataSourceInformationRepository(
+ AxisConfiguration axisConfiguration) {
- Parameter parameter = axisConfiguration.getParameter(DataSourceConfigurationConstants.DATASOURCE_INFORMATION_REPOSITORY);
+ Parameter parameter = axisConfiguration.getParameter(
+ DataSourceConfigurationConstants.DATASOURCE_INFORMATION_REPOSITORY);
if (parameter != null) {
Object result = parameter.getValue();
if (!(result instanceof DataSourceInformationRepository)) {
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=736975&r1=736974&r2=736975&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 Fri Jan 23 01:17:33 2009
@@ -433,7 +433,8 @@
providerUrl = MiscellaneousUtil.getProperty(
dsProperties, rootPrefix + DataSourceConfigurationConstants.PROP_PROVIDER_URL, null);
providerPort =
- MiscellaneousUtil.getProperty(dsProperties, rootPrefix + DataSourceConfigurationConstants.PROP_PROVIDER_PORT,
+ MiscellaneousUtil.getProperty(dsProperties, rootPrefix +
+ DataSourceConfigurationConstants.PROP_PROVIDER_PORT,
String.valueOf(DataSourceConfigurationConstants.DEFAULT_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=736975&r1=736974&r2=736975&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 Fri Jan 23 01:17:33 2009
@@ -72,7 +72,8 @@
handleException(prefix + DataSourceConfigurationConstants.PROP_DRIVER_CLS_NAME + " cannot be found.");
}
- String url = MiscellaneousUtil.getProperty(properties, prefix + DataSourceConfigurationConstants.PROP_URL, null);
+ String url = MiscellaneousUtil.getProperty(properties,
+ prefix + DataSourceConfigurationConstants.PROP_URL, null);
if (url == null) {
handleException(prefix + DataSourceConfigurationConstants.PROP_URL + " 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=736975&r1=736974&r2=736975&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 Fri Jan 23 01:17:33 2009
@@ -36,9 +36,11 @@
return createDataSourceInformationRepository(properties, DataSourceRepositoryManager.getInstance());
}
- public static DataSourceInformationRepository createDataSourceInformationRepository(Properties properties, DataSourceInformationRepositoryListener listener) {
+ public static DataSourceInformationRepository createDataSourceInformationRepository(
+ Properties properties, DataSourceInformationRepositoryListener listener) {
- List<DataSourceInformation> sourceInformationList = DataSourceInformationListFactory.createDataSourceInformationList(properties);
+ List<DataSourceInformation> sourceInformationList =
+ DataSourceInformationListFactory.createDataSourceInformationList(properties);
DataSourceInformationRepository repository = new DataSourceInformationRepository();
repository.setRepositoryListener(listener);
if (properties != null && !properties.isEmpty()) {