[jboss-svn-commits] JBL Code SVN: r10318 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/listeners and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Mar 18 18:55:57 EDT 2007
Author: kevin.conner at jboss.com
Date: 2007-03-18 18:55:56 -0400 (Sun, 18 Mar 2007)
New Revision: 10318
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/LifecycleUtil.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SqlDbTable.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryFactory.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactoryImpl.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
Log:
Fix for SimpleDataSource class loading and updated references to context classloader
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -34,6 +34,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.ClassUtil;
/**
@@ -103,7 +104,7 @@
}
try {
- processorClass = Thread.currentThread().getContextClassLoader().loadClass(classProcessor);
+ processorClass = ClassUtil.forName(classProcessor, getClass());
this.setUpMethod(processorClass);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -9,6 +9,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.helpers.KeyValuePair;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.ClassUtil;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -64,7 +65,7 @@
super(actionName,properties);
String incomingTypeStr = KeyValuePair.getValue("incoming-type", properties);
try {
- incomingType = Thread.currentThread().getContextClassLoader().loadClass(incomingTypeStr);
+ incomingType = ClassUtil.forName(incomingTypeStr, getClass());
} catch (ClassNotFoundException e) {
logger.error("Could not find : " + incomingTypeStr,e);
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/LifecycleUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/LifecycleUtil.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/LifecycleUtil.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -31,6 +31,7 @@
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
import org.jboss.soa.esb.parameters.ParamRepositoryException;
import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
+import org.jboss.soa.esb.util.ClassUtil;
import org.xml.sax.SAXException;
/**
@@ -124,7 +125,7 @@
final Class instanceClass ;
try
{
- instanceClass = loadClass(classname) ;
+ instanceClass = ClassUtil.forName(classname, LifecycleUtil.class) ;
}
catch (final ClassNotFoundException cnfe)
{
@@ -178,36 +179,4 @@
tree.setAttribute("configSource", "param-repository:" + param) ;
return tree ;
}
-
- /**
- * Load the specified class.
- * @param classname The name of the class to load.
- * @return The specified class.
- * @throws ClassNotFoundException If the class cannot be found.
- */
- private static Class loadClass(final String classname)
- throws ClassNotFoundException
- {
- final ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader() ;
- if (threadClassLoader != null)
- {
- try
- {
- return threadClassLoader.loadClass(classname) ;
- }
- catch (final ClassNotFoundException cnfe) {} // ignore
- }
-
- final ClassLoader classLoader = LifecycleUtil.class.getClassLoader() ;
- if (classLoader != null)
- {
- try
- {
- return classLoader.loadClass(classname) ;
- }
- catch (final ClassNotFoundException cnfe) {} // ignore
- }
-
- return Class.forName(classname, true, ClassLoader.getSystemClassLoader()) ;
- }
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -49,6 +49,7 @@
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleException;
import org.jboss.soa.esb.listeners.lifecycle.ManagedLifecycleThreadState;
import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.util.Util;
/**
@@ -444,7 +445,7 @@
_composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
if (null != _composerName)
{ // class attribute
- _composerClass = Thread.currentThread().getContextClassLoader().loadClass(_composerName);
+ _composerClass = ClassUtil.forName(_composerName, getClass());
Constructor oConst = _composerClass.getConstructor(new Class[]
{ ConfigTree.class });
_composer = oConst.newInstance(_config);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/JmsGatewayListener.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -44,6 +44,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.util.ClassUtil;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
@@ -297,7 +298,7 @@
_composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
if (null != _composerName)
{ // class attribute
- _composerClass = Thread.currentThread().getContextClassLoader().loadClass(_composerName);
+ _composerClass = ClassUtil.forName(_composerName, getClass());
Constructor oConst = _composerClass.getConstructor(new Class[]
{ConfigTree.class});
_composer = oConst.newInstance(_config);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -61,6 +61,7 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.services.registry.RegistryException;
+import org.jboss.soa.esb.util.ClassUtil;
import org.jboss.soa.esb.util.Util;
/**
@@ -402,7 +403,7 @@
_composerName = _config.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG);
if (null != _composerName)
{ // class attribute
- _composerClass = Thread.currentThread().getContextClassLoader().loadClass(_composerName);
+ _composerClass = ClassUtil.forName(_composerName, getClass());
Constructor oConst = _composerClass.getConstructor(new Class[]
{ ConfigTree.class });
_composer = oConst.newInstance(_config);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -12,6 +12,7 @@
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessagePlugin;
import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.util.ClassUtil;
/*
* JBoss, Home of Professional Open Source
@@ -74,7 +75,7 @@
try
{
String pluginName = properties.getProperty(attrName);
- Class c = Thread.currentThread().getContextClassLoader().loadClass(pluginName);
+ Class c = ClassUtil.forName(pluginName, getClass());
MessagePlugin thePlugin = (MessagePlugin) c.newInstance();
messageFormats.put(thePlugin.getType(), thePlugin);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/marshal/MarshalUnmarshalManager.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -8,6 +8,7 @@
import org.jboss.soa.esb.MarshalException;
import org.jboss.soa.esb.UnmarshalException;
import org.jboss.soa.esb.common.ModulePropertyManager;
+import org.jboss.soa.esb.util.ClassUtil;
import org.w3c.dom.Element;
/*
@@ -71,7 +72,7 @@
try
{
String pluginName = properties.getProperty(attrName);
- Class c = Thread.currentThread().getContextClassLoader().loadClass(pluginName);
+ Class c = ClassUtil.forName(pluginName, getClass());
MarshalUnmarshalPlugin thePlugin = (MarshalUnmarshalPlugin) c.newInstance();
_plugins.put(thePlugin.type(), thePlugin);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SimpleDataSource.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -29,6 +29,7 @@
import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* <p>
@@ -113,8 +114,7 @@
{
try
{
- //Thread.currentThread().getContextClassLoader().loadClass(p_sDriver);
- Class.forName(p_sDriver);
+ ClassUtil.forName(p_sDriver, getClass());
m_sUrl = p_sDbURL;
getConnection(p_sUsr, p_sPwd);
}
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SqlDbTable.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SqlDbTable.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/persist/SqlDbTable.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -27,6 +27,7 @@
import java.sql.SQLException;
import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.util.ClassUtil;
public abstract class SqlDbTable
{
@@ -186,7 +187,7 @@
{
int iCol = 1 + i1;
String sFN = MD.getColumnName(iCol);
- Class oCL = Thread.currentThread().getContextClassLoader().loadClass(MD.getColumnClassName(iCol));
+ Class oCL = ClassUtil.forName(MD.getColumnClassName(iCol), getClass());
int iTP = MD.getColumnType(iCol);
int iSZ = MD.getColumnDisplaySize(iCol);
m_oaFields[i1] = new SqlField(sFN, oCL, iTP, iSZ, false);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -26,6 +26,7 @@
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* Abstract class to define expected behaviour of all NotificationTargets and
@@ -108,13 +109,13 @@
Class oCls = null;
try
{
- oCls = Thread.currentThread().getContextClassLoader().loadClass(NOTIF_PFX + "." + sClass);
+ oCls = ClassUtil.forName(NOTIF_PFX + "." + sClass, NotificationTarget.class);
}
catch (Exception e)
{
try
{
- oCls = Thread.currentThread().getContextClassLoader().loadClass(sClass);
+ oCls = ClassUtil.forName(sClass, NotificationTarget.class);
}
catch (Exception e1)
{/* oCls will be null */
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryFactory.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryFactory.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -23,6 +23,7 @@
import org.jboss.internal.soa.esb.parameters.ParamFileRepository;
import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* Factory class for Singleton {@link ParamRepository} creation. <p/> Uses the
@@ -88,7 +89,7 @@
{
try
{
- Class<?> runtimeClass = Thread.currentThread().getContextClassLoader().loadClass(runtimeClassName);
+ Class<?> runtimeClass = ClassUtil.forName(runtimeClassName, ParamRepositoryFactory.class);
instance = (ParamRepository) runtimeClass.newInstance();
} catch (Exception e)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStoreFactory.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -25,6 +25,7 @@
import java.net.URI;
import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.util.ClassUtil;
@@ -39,7 +40,7 @@
try {
// Class cls = Class.forName("org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl");
- Class cls = Thread.currentThread().getContextClassLoader().loadClass(Configuration.getStoreConnectionFactory());
+ Class cls = ClassUtil.forName(Configuration.getStoreConnectionFactory(), MessageStoreFactory.class);
Constructor<MessageStoreFactory> c = cls.getConstructor(new Class[]{});
theFactory = c.newInstance(new Object[]{});
} catch (Exception e) {
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/ClassUtil.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -45,7 +45,7 @@
{
try
{
- return threadClassLoader.loadClass(className) ;
+ return Class.forName(className, true, threadClassLoader) ;
}
catch (final ClassNotFoundException cnfe) {} // ignore
}
@@ -56,7 +56,7 @@
{
try
{
- return classLoader.loadClass(className) ;
+ return Class.forName(className, true, classLoader) ;
}
catch (final ClassNotFoundException cnfe) {} // ignore
}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactoryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactoryImpl.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/internal/soa/esb/persistence/format/MessageStoreFactoryImpl.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -32,6 +32,7 @@
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.services.persistence.MessageStoreFactory;
import org.jboss.soa.esb.services.persistence.MessageStoreType;
+import org.jboss.soa.esb.util.ClassUtil;
public class MessageStoreFactoryImpl extends MessageStoreFactory {
@@ -83,7 +84,7 @@
try
{
String pluginName = properties.getProperty(attrName);
- Class c = Thread.currentThread().getContextClassLoader().loadClass(pluginName);
+ Class c = ClassUtil.forName(pluginName, getClass());
MessageStorePlugin thePlugin = (MessageStorePlugin) c.newInstance();
messageStoreFormats.put(thePlugin.getType(), thePlugin);
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -4,9 +4,9 @@
import org.apache.log4j.Priority;
import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Factory;
+import org.jboss.soa.esb.util.ClassUtil;
-public class ConnectionManagerFactory extends Factory {
+public class ConnectionManagerFactory {
private static Logger logger = Logger.getLogger(ConnectionManagerFactory.class);
@@ -18,7 +18,7 @@
try
{
// instruct class loader to load the connection manager
- Class managerClass = getClassForName(className);
+ Class managerClass = ClassUtil.forName(className, ConnectionManagerFactory.class);
ConnectionManager tmp = (ConnectionManager) managerClass.newInstance();
manager = tmp.getInstance();
tmp=null;
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/registry/RegistryFactory.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -24,7 +24,7 @@
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Factory;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* Returns an Instance of the Registry.
@@ -32,7 +32,7 @@
* @author kstam
*
*/
-public class RegistryFactory extends Factory
+public class RegistryFactory
{
private static Logger logger = Logger.getLogger(RegistryFactory.class);
@@ -61,7 +61,7 @@
try
{
// instruct class loader to load the Registry Implementation
- Class registryClass = getClassForName(className);
+ Class registryClass = ClassUtil.forName(className, RegistryFactory.class);
// Try to instance the Registry
registry = (Registry) registryClass.newInstance();
}
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/cbr/ContentBasedRouterFactory.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -24,15 +24,15 @@
import org.apache.log4j.Logger;
import org.apache.log4j.Priority;
import org.jboss.soa.esb.common.Configuration;
-import org.jboss.soa.esb.common.Factory;
import org.jboss.soa.esb.services.routing.MessageRouterException;
+import org.jboss.soa.esb.util.ClassUtil;
/**
* Returns an instance of the Registry.
*
* @author kurt.stam at redhat.com
*
*/
-public class ContentBasedRouterFactory extends Factory {
+public class ContentBasedRouterFactory {
private static Logger logger = Logger.getLogger(ContentBasedRouterFactory.class);
public static ContentBasedRouter getRouter() throws MessageRouterException
@@ -43,7 +43,7 @@
logger.log(Priority.DEBUG, "Going to load " + className);
try {
// instruct class loader to load the Content Based Router Implementation
- Class cbrClass = getClassForName(className);
+ Class cbrClass = ClassUtil.forName(className, ContentBasedRouterFactory.class);
// Try to get an instance of the CBR
cbr = (ContentBasedRouter) cbrClass.newInstance();
} catch (ClassNotFoundException cnfex) {
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java 2007-03-18 22:05:12 UTC (rev 10317)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/DbUtils.java 2007-03-18 22:55:56 UTC (rev 10318)
@@ -284,7 +284,7 @@
try
{
// Register the driver..
- Thread.currentThread().getContextClassLoader().loadClass(dbDriver).newInstance();
+ ClassUtil.forName(dbDriver, getClass());
// Create the connection...
con = DriverManager.getConnection(dbUrl, dbUser, dbPassword);
// Create a regular statement for execution...
More information about the jboss-svn-commits
mailing list