Author: cbegin
Date: Sun Oct 11 00:26:04 2009
New Revision: 823986
URL: http://svn.apache.org/viewvc?rev=823986&view=rev
Log:
Hopefully fixed issues with OSGi classloading
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/ClassLoaderWrapper.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseBuilder.java
Sun Oct 11 00:26:04 2009
@@ -6,6 +6,7 @@
import org.apache.ibatis.type.JdbcType;
import org.apache.ibatis.type.TypeAliasRegistry;
import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.apache.ibatis.io.Resources;
public abstract class BaseBuilder {
protected final Configuration configuration;
@@ -64,7 +65,7 @@
protected Class resolveClass(String alias) {
if (alias == null) return null;
try {
- return Class.forName(resolveAlias(alias));
+ return Resources.classForName(resolveAlias(alias));
} catch (ClassNotFoundException e) {
throw new BuilderException("Error resolving class . Cause: " + e, e);
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java
Sun Oct 11 00:26:04 2009
@@ -75,7 +75,7 @@
String alias = child.getStringAttribute("alias");
String type = child.getStringAttribute("type");
try {
- Class clazz = Class.forName(type);
+ Class clazz = Resources.classForName(type);
if (alias == null) {
typeAliasRegistry.registerAlias(clazz);
} else {
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java
Sun Oct 11 00:26:04 2009
@@ -8,6 +8,7 @@
import org.apache.ibatis.parsing.XPathParser;
import org.apache.ibatis.session.Configuration;
import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.io.Resources;
import java.io.Reader;
import java.util.*;
@@ -70,10 +71,10 @@
if (context != null) {
String type = context.getStringAttribute("type", "PERPETUAL");
type = typeAliasRegistry.resolveAlias(type);
- Class typeClass = Class.forName(type);
+ Class typeClass = Resources.classForName(type);
String eviction = context.getStringAttribute("eviction", "LRU");
eviction = typeAliasRegistry.resolveAlias(eviction);
- Class evictionClass = Class.forName(eviction);
+ Class evictionClass = Resources.classForName(eviction);
Long flushInterval = context.getLongAttribute("flushInterval");
Integer size = context.getIntAttribute("size");
boolean readOnly = context.getBooleanAttribute("readOnly", false);
@@ -226,7 +227,7 @@
if (namespace != null) {
Class boundType = null;
try {
- boundType = Class.forName(namespace);
+ boundType = Resources.classForName(namespace);
} catch (ClassNotFoundException e) {
//ignore, bound type is not required
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java
Sun Oct 11 00:26:04 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.datasource.unpooled;
import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.io.Resources;
import javax.sql.DataSource;
import java.io.PrintWriter;
@@ -159,7 +160,7 @@
if (driverClassLoader != null) {
driverType = Class.forName(driver, true, driverClassLoader);
} else {
- driverType = Class.forName(driver);
+ driverType = Resources.classForName(driver);
}
DriverManager.registerDriver(new DriverProxy((Driver)
driverType.newInstance()));
} catch (Exception e) {
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/ClassLoaderWrapper.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/ClassLoaderWrapper.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/ClassLoaderWrapper.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/io/ClassLoaderWrapper.java
Sun Oct 11 00:26:04 2009
@@ -10,7 +10,6 @@
* A class to wrap access to multiple class loaders making them work as one
*/
public class ClassLoaderWrapper {
- private static final Log log = LogFactory.getLog(ClassLoaderWrapper.class);
ClassLoader defaultClassLoader;
@@ -189,15 +188,12 @@
try {
- log.debug("Looking for " + name + " using " + cl);
-
Class c = cl.loadClass(name);
if (null != c) return c;
} catch (ClassNotFoundException e) {
// we'll ignore this until all classloaders fail to locate the class
- log.debug("Did not find " + name + " using " + cl);
}
}
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
Sun Oct 11 00:26:04 2009
@@ -2,6 +2,7 @@
import org.apache.ibatis.type.TypeHandler;
import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.apache.ibatis.io.Resources;
import java.sql.*;
import java.util.*;
@@ -196,7 +197,7 @@
for (int i = 0, n = rsmd.getColumnCount(); i < n; i++) {
columns.add(rsmd.getColumnLabel(i + 1));
try {
- Class type = Class.forName(rsmd.getColumnClassName(i + 1));
+ Class type = Resources.classForName(rsmd.getColumnClassName(i + 1));
TypeHandler typeHandler = typeHandlerRegistry.getTypeHandler(type);
if (typeHandler == null) {
typeHandler = typeHandlerRegistry.getTypeHandler(Object.class);
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java?rev=823986&r1=823985&r2=823986&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java
Sun Oct 11 00:26:04 2009
@@ -1,5 +1,7 @@
package org.apache.ibatis.logging;
+import org.apache.ibatis.io.Resources;
+
import java.lang.reflect.Constructor;
public class LogFactory {
@@ -73,8 +75,8 @@
private static void setImplementation(String testClassName, String
implClassName) {
try {
- Class.forName(testClassName);
- Class implClass = Class.forName(implClassName);
+ Resources.classForName(testClassName);
+ Class implClass = Resources.classForName(implClassName);
logConstructor = implClass.getConstructor(new Class[]{Class.class});
} catch (Throwable t) {
throw new LogException("Error setting Log implementation. Cause: " + t,
t);
