Author: indika
Date: Sun Mar 21 16:46:03 2010
New Revision: 925823
URL: http://svn.apache.org/viewvc?rev=925823&view=rev
Log:
improve datasource code
add few docs . remove unwanted code
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolViewMBean.java
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/DataSourceFinder.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceHelper.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformation.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepositoryListener.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.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/RepositoryBasedDataSourceFinder.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.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/factory/DataSourceInformationListFactory.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationRepositoryFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurationDetectionStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolView.java
Sun Mar 21 16:46:03 2010
@@ -24,7 +24,7 @@ import java.util.Map;
/**
- * Data source connection pool stats collector implementation
+ * Data source connection pool stats collector implementation
*/
public class DBPoolView implements DBPoolViewMBean {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolViewMBean.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolViewMBean.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolViewMBean.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DBPoolViewMBean.java
Sun Mar 21 16:46:03 2010
@@ -21,7 +21,7 @@ package org.apache.synapse.commons.datas
import java.util.Map;
/**
- * MBean for retriving some statistics about the connection pool
+ * MBean for retrieving some statistics about the connection pool
*/
public interface DBPoolViewMBean {
/**
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=925823&r1=925822&r2=925823&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
Sun Mar 21 16:46:03 2010
@@ -19,7 +19,7 @@
package org.apache.synapse.commons.datasource;
/**
- *
+ * Constants related to the DataSource component
*/
public class DataSourceConstants {
@@ -62,7 +62,6 @@ public class DataSourceConstants {
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_CONNECTIONPROPERTIES =
"connectionProperties";
public static final String PROP_PROVIDER_PORT = "providerPort";
public final static String PROP_REGISTRY = "registry";
public final static String PROP_REGISTRY_MEMORY = "memory";
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=925823&r1=925822&r2=925823&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
Sun Mar 21 16:46:03 2010
@@ -29,7 +29,7 @@ import javax.sql.DataSource;
import java.util.Properties;
/**
- *
+ * Utility class to locate DataSources from a JNDI tree
*/
public class DataSourceFinder {
@@ -49,10 +49,9 @@ public class DataSourceFinder {
return find(dsName, context);
} catch (NamingException e) {
- handleException("Error looking up DataSource : " + dsName +
- " using JNDI properties : " + jndiEnv, e);
+ throw new SynapseCommonsException("Error looking up DataSource : "
+ dsName +
+ " using JNDI properties : " + jndiEnv, e, log);
}
- return null;
}
/**
@@ -69,36 +68,13 @@ public class DataSourceFinder {
if (dataSourceO != null && dataSourceO instanceof DataSource) {
return (DataSource) dataSourceO;
} else {
- handleException("DataSource : " + dsName + " not found when
looking up" +
- " using JNDI properties : " +
context.getEnvironment());
+ throw new SynapseCommonsException("DataSource : " + dsName + "
not found " +
+ "when looking up using JNDI properties : " +
context.getEnvironment(), log);
}
} catch (NamingException e) {
- handleException(new StringBuilder().append("Error looking up
DataSource : ")
- .append(dsName).append(" using JNDI properties : ").
- append(context).toString(), e);
+ throw new SynapseCommonsException("Error looking up DataSource : "
+ dsName + " using JNDI" +
+ " properties : " + context, e, log);
}
- return null;
- }
-
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- */
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- * @param e The exception
- */
- private static void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseCommonsException(msg, e);
}
}
Modified:
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/DataSourceHelper.java?rev=925823&r1=925822&r2=925823&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/DataSourceHelper.java
Sun Mar 21 16:46:03 2010
@@ -18,16 +18,18 @@
*/
package org.apache.synapse.commons.datasource;
-import
org.apache.synapse.commons.datasource.factory.DataSourceInformationRepositoryFactory;
-import org.apache.synapse.commons.SynapseCommonsException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.commons.SynapseCommonsException;
+import
org.apache.synapse.commons.datasource.factory.DataSourceInformationRepositoryFactory;
import java.util.Properties;
/**
* Some help functions related with DataSourceInformationRepository
+ * TODO - rename class name
*/
+...@suppresswarnings("unused")
public class DataSourceHelper {
private static final Log log = LogFactory.getLog(DataSourceHelper.class);
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformation.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformation.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformation.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformation.java
Sun Mar 21 16:46:03 2010
@@ -18,8 +18,8 @@
*/
package org.apache.synapse.commons.datasource;
-import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.synapse.commons.security.secret.SecretInformation;
import java.util.HashMap;
@@ -29,6 +29,7 @@ import java.util.Properties;
/**
* Encapsulates the All information related to a DataSource
*/
+...@suppresswarnings("unused")
public class DataSourceInformation {
public static final String BASIC_DATA_SOURCE = "BasicDataSource";
@@ -90,7 +91,7 @@ public class DataSourceInformation {
public void setDatasourceName(String datasourceName) {
this.datasourceName = datasourceName;
}
-
+
public String getAlias() {
return alias;
}
@@ -333,4 +334,11 @@ public class DataSourceInformation {
public Map<String, Object> getAllParameters() {
return this.parameters;
}
+
+ @Override
+ public String toString() {
+ return "DataSourceInformation{" +
+ "datasourceName='" + datasourceName + '\'' +
+ '}';
+ }
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepository.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepository.java
Sun Mar 21 16:46:03 2010
@@ -28,8 +28,9 @@ import java.util.Map;
import java.util.Properties;
/**
- * Keep and maintain DataSourceInformations
+ * Keep and maintain <code>DataSourceInformation</code>
*/
+...@suppresswarnings("unused")
public class DataSourceInformationRepository {
private static final Log log =
LogFactory.getLog(DataSourceInformationRepository.class);
@@ -42,22 +43,24 @@ public class DataSourceInformationReposi
/**
* Configuring DataSourceInformationRepository
*
- * @param congurationProperties properties to be used for configure
+ * @param configurationProperties properties to be used for configure
*/
- public void setConfigurationProperties(Properties congurationProperties) {
+ public void setConfigurationProperties(Properties configurationProperties)
{
if (listener != null) {
- listener.reConfigure(congurationProperties);
+ listener.reConfigure(configurationProperties);
}
}
/**
* Adding a DataSourceInformation instance
*
- * @param dataSourceInformation DataSourceInformation instance
+ * @param dataSourceInformation <code>DataSourceInformation</code> instance
*/
public void addDataSourceInformation(DataSourceInformation
dataSourceInformation) {
- assertNull(dataSourceInformation, "DataSource information is null");
+ if (dataSourceInformation == null) {
+ throw new SynapseCommonsException("DataSource information is
null", log);
+ }
dataSourceInformationMap.put(dataSourceInformation.getAlias(),
dataSourceInformation);
if (assertListerNotNull()) {
@@ -66,7 +69,7 @@ public class DataSourceInformationReposi
}
/**
- * Get a existing a DataSourceInformation instance by name
+ * Get an existing <code>DataSourceInformation</code> instance for the
given name
*
* @param name Name of the DataSourceInformation to be returned
* @return DataSourceInformation instance if the are any with given name,
otherwise
@@ -74,7 +77,10 @@ public class DataSourceInformationReposi
*/
public DataSourceInformation getDataSourceInformation(String name) {
- assertNull(name, "Name of the datasource information instance to be
returned is null");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("Name of the datasource
information instance to be " +
+ "returned is null", log);
+ }
return dataSourceInformationMap.get(name);
}
@@ -87,23 +93,31 @@ public class DataSourceInformationReposi
*/
public DataSourceInformation removeDataSourceInformation(String name) {
- assertNull(name, "Name of the datasource information instance to be
removed is null");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("Name of the datasource
information instance to be" +
+ " removed is null", log);
+
+ }
DataSourceInformation information =
dataSourceInformationMap.remove(name);
- assertNull(information, "There is no datasource information instance
for given name :" +
- name);
+ if (information == null) {
+ throw new SynapseCommonsException("There is no datasource
information instance" +
+ " for given name :" + name, log);
+
+ }
if (assertListerNotNull()) {
listener.removeDataSourceInformation(information);
}
+
return information;
}
/**
- * Returns all DataSourceInformations in the repository
+ * Returns all <code>DataSourceInformation</code>s in the repository
*
- * @return List of DataSourceInformations
+ * @return List of <code>DataSourceInformation</code>s
*/
public Iterator<DataSourceInformation> getAllDataSourceInformation() {
@@ -111,31 +125,34 @@ public class DataSourceInformationReposi
}
/**
- * Sets a DataSourceInformationRepositoryListener
+ * Sets a <code>DataSourceInformationRepositoryListener</code> instance
*
- * @param listener DataSourceInformationRepositoryListener instance
+ * @param listener <code>DataSourceInformationRepositoryListener</code>
instance
*/
public void setRepositoryListener(DataSourceInformationRepositoryListener
listener) {
- assertNull(listener, "Provided
'DataSourceInformationRepositoryListener' " +
- "instance is null");
+ if (listener == null) {
+ throw new SynapseCommonsException("Provided
DataSourceInformationRepositoryListener " +
+ "instance is null", log);
+ }
if (this.listener != null) {
- handleException("There is a
'DataSourceInformationRepositoryListener' " +
- "associated with 'DataSourceInformationRepository'");
+ throw new SynapseCommonsException("There is already a
DataSourceInformationRepositoryListener " +
+ "associated with 'DataSourceInformationRepository", log);
}
+
this.listener = listener;
}
/**
- * Remove existing DataSourceInformationRepositoryListener
+ * Remove existing <code>DataSourceInformationRepositoryListener</code>
*/
public void removeRepositoryListener() {
this.listener = null;
}
/**
- * Gets existing DataSourceInformationRepositoryListener
+ * Gets the existing <code>DataSourceInformationRepositoryListener</code>
*
* @return DataSourceInformationRepositoryListener that have been
registered
*/
@@ -146,30 +163,13 @@ public class DataSourceInformationReposi
private boolean assertListerNotNull() {
if (listener == null) {
if (log.isDebugEnabled()) {
- log.debug("Cannot find a
'DataSourceInformationRepositoryListener'.");
+ log.debug("Cannot find a
DataSourceInformationRepositoryListener.");
}
return false;
}
if (log.isDebugEnabled()) {
- log.debug("Using 'DataSourceInformationRepositoryListener' as :" +
listener);
+ log.debug("Using DataSourceInformationRepositoryListener as :" +
listener);
}
return true;
}
-
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
- private void assertNull(String name, String msg) {
- if (name == null || "".equals(name)) {
- handleException(msg);
- }
- }
-
- private void assertNull(Object object, String msg) {
- if (object == null) {
- handleException(msg);
- }
- }
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepositoryListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepositoryListener.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepositoryListener.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceInformationRepositoryListener.java
Sun Mar 21 16:46:03 2010
@@ -21,14 +21,14 @@ package org.apache.synapse.commons.datas
import java.util.Properties;
/**
- * listen and handle events relating to changes in
DataSourceInformationRepository
+ * listen and handle events relating to changes in
<code>DataSourceInformationRepository</code>
*/
public interface DataSourceInformationRepositoryListener {
/**
* Event when adding a DataSourceInformation
*
- * @param dataSourceInformation Added DataSourceInformation instance
+ * @param dataSourceInformation added DataSourceInformation instance
*/
void addDataSourceInformation(DataSourceInformation dataSourceInformation);
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepository.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepository.java
Sun Mar 21 16:46:03 2010
@@ -58,7 +58,7 @@ public interface DataSourceRepository {
/**
* Find and Returns an registered DataSource in the DataSourceRegistry
*
- * @param name Name of the DataSoure to be looked up
+ * @param name Name of the DataSource to be looked up
* @return DataSource Instance
*/
DataSource lookUp(String name);
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DataSourceRepositoryManager.java
Sun Mar 21 16:46:03 2010
@@ -26,15 +26,14 @@ import javax.sql.DataSource;
import java.util.Properties;
/**
- * Utility class to handle data source registration
+ * Manages data sources defined in the synapse. This is an observer of the
DataSourceInformationRepository
*/
public class DataSourceRepositoryManager implements
DataSourceInformationRepositoryListener {
private static final Log log =
LogFactory.getLog(DataSourceRepositoryManager.class);
-
- private InMemoryDataSourceRepository inMemoryDataSourceRepository;
- private JNDIBasedDataSourceRepository jndiBasedDataSourceRepository;
+ private final InMemoryDataSourceRepository inMemoryDataSourceRepository;
+ private final JNDIBasedDataSourceRepository jndiBasedDataSourceRepository;
public DataSourceRepositoryManager(InMemoryDataSourceRepository
inMemoryDataSourceRepository,
JNDIBasedDataSourceRepository
jndiBasedDataSourceRepository) {
@@ -51,27 +50,49 @@ public class DataSourceRepositoryManager
public DataSource getDataSource(String name) {
if (name == null || "".equals(name)) {
- handleException("DataSource name cannot be found.");
+ throw new SynapseCommonsException("DataSource name cannot be
found.", log);
}
DataSource result = inMemoryDataSourceRepository.lookUp(name);
if (result != null) {
+ if (log.isDebugEnabled()) {
+ log.debug("DataSource is found in the in-memory data source
repository." +
+ " Datasource name is : " + name);
+ }
return result;
}
+
if (jndiBasedDataSourceRepository.isInitialized()) {
- return jndiBasedDataSourceRepository.lookUp(name);
+ result = jndiBasedDataSourceRepository.lookUp(name);
+ if (result != null) {
+ if (log.isDebugEnabled()) {
+ log.debug("DataSource is found in the JNDI data source
repository." +
+ " Datasource name is : " + name);
+ }
+ return result;
+ }
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find a datasource with name : " + name + "
either in in-memory or" +
+ " JNDI datasource repositories");
}
- return null;
+
+ return result;
}
public void addDataSourceInformation(DataSourceInformation
dataSourceInformation) {
- if (dataSourceInformation == null) {
- return;
- }
+ assertDataSourceInformationNull(dataSourceInformation);
String repositoryType = dataSourceInformation.getRepositoryType();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Registering a datasource in the repository : " +
repositoryType + "." +
+ " DataSource information is : " + dataSourceInformation);
+ }
+
if (DataSourceConstants.PROP_REGISTRY_JNDI.equals(repositoryType)) {
jndiBasedDataSourceRepository.register(dataSourceInformation);
} else {
@@ -81,8 +102,15 @@ public class DataSourceRepositoryManager
public void removeDataSourceInformation(DataSourceInformation
dataSourceInformation) {
+ assertDataSourceInformationNull(dataSourceInformation);
+
String repositoryType = dataSourceInformation.getRepositoryType();
+ if (log.isDebugEnabled()) {
+ log.debug("Un-Registering a datasource from the repository : " +
repositoryType + "." +
+ " DataSource information is : " + dataSourceInformation);
+ }
+
if (DataSourceConstants.PROP_REGISTRY_JNDI.equals(repositoryType)) {
jndiBasedDataSourceRepository.unRegister(dataSourceInformation.getDatasourceName());
} else {
@@ -92,11 +120,22 @@ public class DataSourceRepositoryManager
public void reConfigure(Properties confProperties) {
+ if (log.isDebugEnabled()) {
+ log.debug("Reconfiguring datasource repositories ");
+ }
jndiBasedDataSourceRepository.init(confProperties);
inMemoryDataSourceRepository.init(confProperties);
}
+ /**
+ * Clear all DataSource Repositories
+ */
public void clear() {
+
+ if (log.isDebugEnabled()) {
+ log.debug("Clearing datasource repositories ");
+ }
+
if (inMemoryDataSourceRepository.isInitialized()) {
inMemoryDataSourceRepository.clear();
}
@@ -105,14 +144,10 @@ public class DataSourceRepositoryManager
}
}
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- */
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
+ private void assertDataSourceInformationNull(DataSourceInformation
dataSourceInformation) {
+ if (dataSourceInformation == null) {
+ throw new SynapseCommonsException("Provided DataSource Information
instance is null",
+ log);
+ }
}
-
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/DatasourceMBeanRepository.java
Sun Mar 21 16:46:03 2010
@@ -28,13 +28,13 @@ import java.util.HashMap;
import java.util.Map;
/**
- *
+ * Keeps DatasourceMBeans
*/
public class DatasourceMBeanRepository implements MBeanRepository {
private final static Log log =
LogFactory.getLog(DatasourceMBeanRepository.class);
- private final static Map<String, DBPoolView> dataSourcesMBeans
+ private final Map<String, DBPoolView> dataSourcesMBeans
= new HashMap<String, DBPoolView>();
private final static DatasourceMBeanRepository DATASOURCE_M_BEAN_REPOSITORY
= new DatasourceMBeanRepository();
@@ -49,18 +49,27 @@ public class DatasourceMBeanRepository i
public void addMBean(String name, Object mBean) {
- assertNull(name, "DataSorce MBean name cannot be found.");
- assertNull(mBean, "DataSorce MBean cannot be found.");
- assertFalse(mBean instanceof DBPoolView, "Given MBean instance is not
matched " +
- "with the expected MBean - 'DBPoolView'.");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("DataSource MBean name cannot be
found.", log);
+ }
+
+ if (mBean == null) {
+ throw new SynapseCommonsException("DataSource MBean cannot be
found.", log);
+ }
+
+ if (!(mBean instanceof DBPoolView)) {
+ throw new SynapseCommonsException("Given MBean instance is not
matched" +
+ "with the expected MBean - 'DBPoolView'", log);
+ }
dataSourcesMBeans.put(name, (DBPoolView) mBean);
MBeanRegistrar.getInstance().registerMBean(mBean,
MBEAN_CATEGORY_DATABASE_CONNECTION_POOL, name);
}
public Object getMBean(String name) {
-
- assertNull(name, "DataSorce MBean name cannot be found.");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("DataSource MBean name cannot be
found.", log);
+ }
return dataSourcesMBeans.get(name);
}
@@ -83,34 +92,4 @@ public class DatasourceMBeanRepository i
dataSourcesMBeans.clear();
}
}
-
- private void assertNull(String name, String msg) {
- if (name == null || "".equals(name)) {
- handleException(msg);
- }
- }
-
- private void assertNull(Object object, String msg) {
- if (object == null) {
- handleException(msg);
- }
- }
-
- private void assertFalse(boolean condition, String msg) {
- if (!condition) {
- handleException(msg);
- }
- }
-
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- */
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
-
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/InMemoryDataSourceRepository.java
Sun Mar 21 16:46:03 2010
@@ -39,23 +39,22 @@ public class InMemoryDataSourceRepositor
private final static Log log =
LogFactory.getLog(InMemoryDataSourceRepository.class);
- private final static Map<String, DataSource> dataSources = new
HashMap<String, DataSource>();
- private final static MBeanRepository REPOSITORY =
DatasourceMBeanRepository.getInstance();
+ private final Map<String, DataSource> dataSources = new HashMap<String,
DataSource>();
+ private static final MBeanRepository REPOSITORY =
DatasourceMBeanRepository.getInstance();
public InMemoryDataSourceRepository() {
}
/**
* Keep DataSource in the Local store.
- *
- * @param dataSourceInformation the information describing a data source
*
+ * @param dataSourceInformation the information describing a data source
* @see DataSourceRepository#register(DataSourceInformation)
*/
public void register(DataSourceInformation dataSourceInformation) {
if (dataSourceInformation == null) {
- handleException("DataSourceInformation cannot be found.");
+ throw new SynapseCommonsException("DataSourceInformation cannot be
found.", log);
}
DataSource dataSource =
DataSourceFactory.createDataSource(dataSourceInformation);
@@ -81,7 +80,11 @@ public class InMemoryDataSourceRepositor
public void unRegister(String name) {
- assertNull(name, "Name of the datasource to be removed is empty or
null");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("Name of the datasource to be
removed is empty or " +
+ "null", log);
+ }
+
dataSources.remove(name);
REPOSITORY.removeMBean(name);
}
@@ -93,7 +96,11 @@ public class InMemoryDataSourceRepositor
*/
public DataSource lookUp(String name) {
- assertNull(name, "DataSorce name cannot be found.");
+ if (name == null || "".equals(name)) {
+ throw new SynapseCommonsException("Name of the datasource to be
looked up is empty or" +
+ "null", log);
+ }
+
return dataSources.get(name);
}
@@ -111,18 +118,5 @@ public class InMemoryDataSourceRepositor
dataSources.clear();
}
REPOSITORY.clear();
-
- }
-
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
-
- private void assertNull(String name, String msg) {
- if (name == null || "".equals(name)) {
- handleException(msg);
- }
}
}
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=925823&r1=925822&r2=925823&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
Sun Mar 21 16:46:03 2010
@@ -23,10 +23,10 @@ package org.apache.synapse.commons.datas
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.commons.util.MiscellaneousUtil;
-import org.apache.synapse.commons.util.RMIRegistryController;
import org.apache.synapse.commons.SynapseCommonsException;
import org.apache.synapse.commons.security.SecurityConstants;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
+import org.apache.synapse.commons.util.RMIRegistryController;
import javax.naming.*;
import javax.sql.DataSource;
@@ -43,10 +43,10 @@ public class JNDIBasedDataSourceReposito
private InitialContext initialContext;
private Properties jndiProperties;
- private static final Map<String, InitialContext> perDataSourceICMap
+ private final Map<String, InitialContext> perDataSourceICMap
= new HashMap<String, InitialContext>();
- private static final List<String> cachedNameList = new ArrayList<String>();
- private static final List<Integer> cachedPorts = new ArrayList<Integer>();
+ private final List<String> cachedNameList = new ArrayList<String>();
+ private final List<Integer> cachedPorts = new ArrayList<Integer>();
private boolean initialized = false;
@@ -65,7 +65,7 @@ public class JNDIBasedDataSourceReposito
initialContext = createInitialContext(jndiProperties);
}
}
-
+
/**
* Register a DataSource in the JNDI tree
*
@@ -159,7 +159,7 @@ public class JNDIBasedDataSourceReposito
} catch (NamingException e) {
String msg = " Error binding name ' " + dataSourceName + " '
to " +
"the DataSource(BasicDataSource) reference";
- handleException(msg, e);
+ throw new SynapseCommonsException(msg, e, log);
}
} else if
(DataSourceInformation.PER_USER_POOL_DATA_SOURCE.equals(dsType)) {
@@ -192,7 +192,7 @@ public class JNDIBasedDataSourceReposito
} catch (NamingException e) {
String msg = "Error binding name '" + name + "' to " +
"the DriverAdapterCPDS reference";
- handleException(msg, e);
+ throw new SynapseCommonsException(msg, e, log);
}
// Construct PerUserPoolDataSource reference
@@ -227,11 +227,11 @@ public class JNDIBasedDataSourceReposito
} catch (NamingException e) {
String msg = "Error binding name ' " + dataSourceName + " ' to
" +
"the PerUserPoolDataSource reference";
- handleException(msg, e);
+ throw new SynapseCommonsException(msg, e, log);
}
} else {
- handleException("Unsupported data source type : " + dsType);
+ throw new SynapseCommonsException("Unsupported data source type :
" + dsType, log);
}
cachedNameList.add(dataSourceName);
}
@@ -242,7 +242,7 @@ public class JNDIBasedDataSourceReposito
try {
context.unbind(name);
} catch (NamingException e) {
- handleException("Error removing a Datasource with name : " +
+ throw new SynapseCommonsException("Error removing a Datasource
with name : " +
name + " from the JNDI context : " + initialContext, e);
}
cachedNameList.remove(name);
@@ -395,17 +395,19 @@ public class JNDIBasedDataSourceReposito
assert context != null;
context = context.createSubcontext(path1);
if (context == null) {
- handleException("sub context " + path1 + " could not
be created");
+ throw new SynapseCommonsException("sub context " +
path1 + " could not" +
+ " be created", log);
}
} catch (NamingException e) {
- handleException("Unable to create sub context : " + path1,
e);
+ throw new SynapseCommonsException("Unable to create sub
context : " + path1,
+ e, log);
}
}
}
}
- private static Properties createJNDIEnvironment(Properties dsProperties,
String name) {
+ private Properties createJNDIEnvironment(Properties dsProperties, String
name) {
String namingFactory = DataSourceConstants.DEFAULT_IC_FACTORY;
String providerUrl = null;
@@ -502,43 +504,23 @@ public class JNDIBasedDataSourceReposito
return initialized;
}
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- */
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- * @param e The exception
- */
- private static void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseCommonsException(msg, e);
- }
-
private void validateInitialized() {
if (!isInitialized()) {
- handleException("Datasource registry has not been initialized
yet");
+ throw new SynapseCommonsException("Datasource repository has not
been initialized " +
+ "yet", log);
}
}
private void validateDSName(String dataSourceName) {
if (dataSourceName == null || "".equals(dataSourceName)) {
- handleException("Invalid DataSource configuration !! -" +
- "DataSource Name cannot be found ");
+ throw new SynapseCommonsException("Invalid DataSource
configuration !! -" +
+ "DataSource Name cannot be found ", log);
}
}
private void validateInitialContext(InitialContext initialContext) {
if (initialContext == null) {
- handleException("InitialContext cannot be found.");
+ throw new SynapseCommonsException("InitialContext cannot be
found.", log);
}
}
@@ -557,10 +539,9 @@ public class JNDIBasedDataSourceReposito
return new InitialContext(jndiEnv);
} catch (NamingException e) {
- handleException("Error creating a InitialConext" +
- " with JNDI env jndiProperties : " + jndiEnv);
+ throw new SynapseCommonsException("Error creating a
InitialContext" +
+ " with JNDI env jndiProperties : " + jndiEnv, log);
}
- return null;
}
private boolean isValid(Properties dsProperties) {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/RepositoryBasedDataSourceFinder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/RepositoryBasedDataSourceFinder.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/RepositoryBasedDataSourceFinder.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/RepositoryBasedDataSourceFinder.java
Sun Mar 21 16:46:03 2010
@@ -25,49 +25,37 @@ import org.apache.synapse.commons.Synaps
import javax.sql.DataSource;
/**
- * Finds a DataSource from DataSourceRepositories
+ * Finds a DataSource from DataSource Repositories
*/
public class RepositoryBasedDataSourceFinder {
private final static Log log =
LogFactory.getLog(RepositoryBasedDataSourceFinder.class);
private DataSourceRepositoryManager dataSourceRepositoryManager;
private boolean initialized;
-
+
public void init(DataSourceRepositoryManager dataSourceRepositoryManager) {
this.dataSourceRepositoryManager = dataSourceRepositoryManager;
this.initialized = true;
}
/**
- * Find a DataSource using given name
+ * Find a DataSource using the given name
*
- * @param name Name of the DataSource to be found
+ * @param name name of the DataSource to be found
* @return DataSource if found , otherwise null
*/
public DataSource find(String name) {
assertInitialized();
if (name == null || "".equals(name)) {
- handleException("DataSource name cannot be found.");
+ throw new SynapseCommonsException("DataSource name cannot be
found.", log);
}
-
return dataSourceRepositoryManager.getDataSource(name);
}
-
- /**
- * Helper methods for handle errors.
- *
- * @param msg The error message
- */
- private static void handleException(String msg) {
- log.error(msg);
- throw new SynapseCommonsException(msg);
- }
-
private void assertInitialized() {
if (!initialized) {
- handleException("RepositoryBasedDataSourceFinder has not been " +
- "initialized with a 'DataSourceRepositoryManager' instance
");
+ throw new SynapseCommonsException("RepositoryBasedDataSourceFinder
has not been " +
+ "initialized with a 'DataSourceRepositoryManager' instance
", log);
}
}
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceFactory.java
Sun Mar 21 16:46:03 2010
@@ -180,7 +180,7 @@ public class DataSourceFactory {
return perUserPoolDataSource;
} else {
- handleException("Unsupported DataSorce : " + dsType);
+ handleException("Unsupported DataSource : " + dsType);
}
return null;
}
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=925823&r1=925822&r2=925823&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
Sun Mar 21 16:46:03 2010
@@ -22,13 +22,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.pool.impl.GenericKeyedObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.SynapseCommonsException;
import org.apache.synapse.commons.datasource.DataSourceConstants;
import org.apache.synapse.commons.datasource.DataSourceInformation;
import org.apache.synapse.commons.security.SecurityConstants;
import org.apache.synapse.commons.security.secret.SecretInformation;
import org.apache.synapse.commons.security.secret.SecretInformationFactory;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.util.Properties;
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationListFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationListFactory.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationListFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationListFactory.java
Sun Mar 21 16:46:03 2010
@@ -20,9 +20,9 @@ package org.apache.synapse.commons.datas
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.commons.util.MiscellaneousUtil;
import org.apache.synapse.commons.datasource.DataSourceConstants;
import org.apache.synapse.commons.datasource.DataSourceInformation;
+import org.apache.synapse.commons.util.MiscellaneousUtil;
import java.util.ArrayList;
import java.util.List;
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationRepositoryFactory.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationRepositoryFactory.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/factory/DataSourceInformationRepositoryFactory.java
Sun Mar 21 16:46:03 2010
@@ -52,7 +52,6 @@ public class DataSourceInformationReposi
*
* @param listener DataSourceInformationRepositoryListener
* @param properties DataSource properties
- *
* @return a new, configured DataSourceInformationRepository instance
*/
public static DataSourceInformationRepository
createDataSourceInformationRepository(
@@ -70,27 +69,28 @@ public class DataSourceInformationReposi
return datasourceInformationRepository;
}
- /**
+ /**
* Setup an existing datasource information repository adding the provided
* datasource information.
*
- * @param datasourceInformationRepository an existing data source
information repository
+ * @param datasourceInformationRepository
+ * an existing data source information repository
* @param properties DataSource properties
*/
public static void setupDatasourceInformationRepository(
- DataSourceInformationRepository datasourceInformationRepository,
- Properties properties) {
+ DataSourceInformationRepository datasourceInformationRepository,
+ Properties properties) {
+
+ if (properties != null) {
+
datasourceInformationRepository.setConfigurationProperties(properties);
+ }
+ List<DataSourceInformation> sourceInformationList =
+
DataSourceInformationListFactory.createDataSourceInformationList(properties);
- if (properties != null) {
-
datasourceInformationRepository.setConfigurationProperties(properties);
- }
- List<DataSourceInformation> sourceInformationList =
-
DataSourceInformationListFactory.createDataSourceInformationList(properties);
-
- for (DataSourceInformation information : sourceInformationList) {
- if (information != null) {
-
datasourceInformationRepository.addDataSourceInformation(information);
- }
- }
- }
+ for (DataSourceInformation information : sourceInformationList) {
+ if (information != null) {
+
datasourceInformationRepository.addDataSourceInformation(information);
+ }
+ }
+ }
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurationDetectionStrategy.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurationDetectionStrategy.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurationDetectionStrategy.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/AspectConfigurationDetectionStrategy.java
Sun Mar 21 16:46:03 2010
@@ -28,7 +28,7 @@ import org.apache.synapse.endpoints.Endp
import org.apache.synapse.endpoints.EndpointDefinition;
/**
- * Take an AspectConfiguration based on some startegy - Currently only
consider statistics
+ * Take an AspectConfiguration based on some strategy - Currently only
consider statistics
*/
public class AspectConfigurationDetectionStrategy {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsView.java
Sun Mar 21 16:46:03 2010
@@ -47,7 +47,7 @@ public class StatisticsView implements S
ComponentType.ENDPOINT));
}
- public List<String> getSystemSequnceStats(String id) {
+ public List<String> getSystemSequenceStats(String id) {
return getAsList(this.systemViewStrategy.determineView(id,
collector.getStatisticsRecords(),
ComponentType.SEQUENCE));
@@ -66,7 +66,7 @@ public class StatisticsView implements S
ComponentType.ENDPOINT));
}
- public List<String> getSystemSequncesStats() {
+ public List<String> getSystemSequencesStats() {
return getAllStatsAsList(
this.systemViewStrategy.determineView(collector.getStatisticsRecords(),
ComponentType.SEQUENCE));
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java?rev=925823&r1=925822&r2=925823&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/aspects/statistics/mbean/StatisticsViewMBean.java
Sun Mar 21 16:46:03 2010
@@ -27,13 +27,13 @@ public interface StatisticsViewMBean {
List<String> getSystemEndpointStats(String id);
- List<String> getSystemSequnceStats(String id);
+ List<String> getSystemSequenceStats(String id);
List<String> getSystemProxyServiceStats(String id);
List<String> getSystemEndpointsStats();
- List<String> getSystemSequncesStats();
+ List<String> getSystemSequencesStats();
List<String> getSystemProxyServicesStats();
