[infinispan-commits] Infinispan SVN: r406 - in trunk: cachestore/jdbc/src/test/java/org/infinispan/test/fwk and 6 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Wed Jun 3 11:07:27 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-06-03 11:07:27 -0400 (Wed, 03 Jun 2009)
New Revision: 406
Modified:
trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
trunk/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java
trunk/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java
trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java
trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java
Log:
[ISPN-50] (Use Util to load and instantiate classes) Done.
Modified: trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
===================================================================
--- trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -1,6 +1,7 @@
package org.infinispan.loaders.jdbc.connectionfactory;
import org.infinispan.loaders.CacheLoaderException;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -57,7 +58,7 @@
if (log.isTraceEnabled()) {
log.trace("Attempting to load driver " + driverClass);
}
- Class.forName(driverClass).newInstance();
+ Util.getInstance(driverClass);
}
catch (Throwable th) {
String message = "Failed loading driver with class: '" + driverClass + "'";
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/test/fwk/UnitTestDatabaseManager.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -6,6 +6,7 @@
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
import org.infinispan.loaders.jdbc.connectionfactory.PooledConnectionFactory;
+import org.infinispan.util.Util;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -33,7 +34,7 @@
static {
try {
- Class.forName("org.hsqldb.jdbcDriver");
+ Util.loadClass("org.hsqldb.jdbcDriver");
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
Modified: trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
===================================================================
--- trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -5,6 +5,7 @@
import org.infinispan.CacheException;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.marshall.Marshaller;
+import org.infinispan.util.Util;
/**
* Configures {@link JdbmCacheStore}.
@@ -59,7 +60,7 @@
*/
public Comparator createComparator() {
try {
- return (Comparator) Class.forName(comparatorClassName).newInstance();
+ return (Comparator) Util.getInstance(comparatorClassName);
} catch (Exception e) {
throw new CacheException(e);
}
Modified: trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -8,6 +8,7 @@
import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
import org.infinispan.remoting.InboundInvocationHandler;
import org.infinispan.transaction.xa.TransactionTable;
+import org.infinispan.util.Util;
/**
* Factory for building global-scope components which have default empty constructors
@@ -21,11 +22,10 @@
public class EmptyConstructorFactory extends AbstractComponentFactory implements AutoInstantiableFactory {
public <T> T construct(Class<T> componentType) {
try {
- if (componentType.isInterface()) {
- Class componentImpl = getClass().getClassLoader().loadClass(componentType.getName() + "Impl");
- return componentType.cast(componentImpl.newInstance());
+ if (componentType.isInterface()) {
+ return componentType.cast(Util.getInstance(componentType.getName() + "Impl"));
} else {
- return componentType.newInstance();
+ return Util.getInstance(componentType);
}
}
catch (Exception e) {
Modified: trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/factories/EmptyConstructorNamedCacheFactory.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -34,6 +34,7 @@
import org.infinispan.marshall.VersionAwareMarshaller;
import org.infinispan.notifications.cachelistener.CacheNotifier;
import org.infinispan.transaction.TransactionLog;
+import org.infinispan.util.Util;
/**
* Simple factory that just uses reflection and an empty constructor of the component type.
@@ -56,11 +57,11 @@
componentImpl = InvocationContextContainerImpl.class;
} else {
// add an "Impl" to the end of the class name and try again
- componentImpl = getClass().getClassLoader().loadClass(componentType.getName() + "Impl");
+ componentImpl = Util.loadClass(componentType.getName() + "Impl");
}
- return componentType.cast(componentImpl.newInstance());
+ return componentType.cast(Util.getInstance(componentImpl));
} else {
- return componentType.newInstance();
+ return Util.getInstance(componentType);
}
}
catch (Exception e) {
Modified: trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -25,6 +25,7 @@
import org.infinispan.factories.annotations.DefaultFactoryFor;
import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.infinispan.transaction.lookup.TransactionManagerLookup;
+import org.infinispan.util.Util;
import javax.transaction.TransactionManager;
@@ -44,11 +45,8 @@
if (transactionManager == null) {
// Nope. See if we can look it up from JNDI
if (configuration.getTransactionManagerLookupClass() != null) {
- try {
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- if (cl == null) cl = getClass().getClassLoader();
- Class clazz = cl.loadClass(configuration.getTransactionManagerLookupClass());
- lookup = (TransactionManagerLookup) clazz.newInstance();
+ try {
+ lookup = (TransactionManagerLookup) Util.getInstance(configuration.getTransactionManagerLookupClass());
}
catch (Exception e) {
throw new ConfigurationException("Problems looking up transaction manager", e);
Modified: trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -24,6 +24,7 @@
import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -226,7 +227,7 @@
public static Class<?> getClassForName(String name) throws ClassNotFoundException {
try {
- Class<?> c = Class.forName(name);
+ Class<?> c = Util.loadClass(name);
return c;
}
catch (ClassNotFoundException cnfe) {
Modified: trunk/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/transaction/lookup/GenericTransactionManagerLookup.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -22,6 +22,7 @@
package org.infinispan.transaction.lookup;
import org.infinispan.transaction.tm.DummyTransactionManager;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -142,19 +143,19 @@
Class clazz;
try {
log.debug("Trying WebSphere 5.1: " + WS_FACTORY_CLASS_5_1);
- clazz = Class.forName(WS_FACTORY_CLASS_5_1);
+ clazz = Util.loadClass(WS_FACTORY_CLASS_5_1);
log.debug("Found WebSphere 5.1: " + WS_FACTORY_CLASS_5_1);
}
catch (ClassNotFoundException ex) {
try {
log.debug("Trying WebSphere 5.0: " + WS_FACTORY_CLASS_5_0);
- clazz = Class.forName(WS_FACTORY_CLASS_5_0);
+ clazz = Util.loadClass(WS_FACTORY_CLASS_5_0);
log.debug("Found WebSphere 5.0: " + WS_FACTORY_CLASS_5_0);
}
catch (ClassNotFoundException ex2) {
try {
log.debug("Trying WebSphere 4: " + WS_FACTORY_CLASS_4);
- clazz = Class.forName(WS_FACTORY_CLASS_4);
+ clazz = Util.loadClass(WS_FACTORY_CLASS_4);
log.debug("Found WebSphere 4: " + WS_FACTORY_CLASS_4);
}
catch (ClassNotFoundException ex3) {
Modified: trunk/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/transaction/lookup/JBossStandaloneJTAManagerLookup.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -24,6 +24,9 @@
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
+
+import org.infinispan.util.Util;
+
import java.lang.reflect.Method;
/**
@@ -37,8 +40,8 @@
public JBossStandaloneJTAManagerLookup() {
try {
- manager = Class.forName("com.arjuna.ats.jta.TransactionManager").getMethod("transactionManager");
- user = Class.forName("com.arjuna.ats.jta.UserTransaction").getMethod("userTransaction");
+ manager = Util.loadClass("com.arjuna.ats.jta.TransactionManager").getMethod("transactionManager");
+ user = Util.loadClass("com.arjuna.ats.jta.UserTransaction").getMethod("userTransaction");
}
catch (Exception e) {
throw new RuntimeException(e);
Modified: trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/core/src/main/java/org/infinispan/util/logging/LogFactory.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -1,5 +1,7 @@
package org.infinispan.util.logging;
+import org.infinispan.util.Util;
+
/**
* Factory that creates {@link Log} instances.
*
@@ -13,7 +15,7 @@
static {
boolean available;
try {
- Class.forName("org.apache.log4j.Logger");
+ Util.loadClass("org.apache.log4j.Logger");
available = true;
}
catch (ClassNotFoundException cnfe) {
Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java 2009-06-03 15:05:53 UTC (rev 405)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java 2009-06-03 15:07:27 UTC (rev 406)
@@ -18,6 +18,7 @@
*/
package org.infinispan.jopr.infinispan;
+import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
import org.mc4j.ems.connection.ConnectionFactory;
@@ -89,8 +90,8 @@
PropertySimple serverUrl = pluginConfig
.getSimple(JMXDiscoveryComponent.CONNECTOR_ADDRESS_CONFIG_PROPERTY);
- connectionSettings.initializeConnectionType((ConnectionTypeDescriptor) Class.forName(
- connectionTypeDescriptorClass).newInstance());
+ connectionSettings.initializeConnectionType((ConnectionTypeDescriptor) Util.getInstance(
+ connectionTypeDescriptorClass));
// if not provided use the default serverUrl
if (null != serverUrl) {
connectionSettings.setServerUrl(serverUrl.getStringValue());
More information about the infinispan-commits
mailing list