Author: tolusha Date: 2012-01-04 06:44:01 -0500 (Wed, 04 Jan 2012) New Revision: 5418 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java Log: EXOJCR-1580: Make eXo JCR supports JBoss AS7 Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-01-04 11:37:05 UTC (rev 5417) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-01-04 11:44:01 UTC (rev 5418) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.database.creator; +import org.exoplatform.commons.utils.ClassLoading; import org.exoplatform.commons.utils.PrivilegedFileHelper; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.container.configuration.ConfigurationException; @@ -480,7 +481,7 @@ Connection conn = null; try { - Class.forName(connectionProperties.get(DRIVER_NAME)); + ClassLoading.forName(connectionProperties.get(DRIVER_NAME), this); conn = SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>() { Modified: core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java =================================================================== --- core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-01-04 11:37:05 UTC (rev 5417) +++ core/branches/2.5.x/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-01-04 11:44:01 UTC (rev 5418) @@ -19,6 +19,7 @@ package org.exoplatform.services.database.impl; import org.exoplatform.commons.exception.ObjectNotFoundException; +import org.exoplatform.commons.utils.ClassLoading; import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.commons.utils.SecurityHelper; import org.exoplatform.container.ExoContainer; @@ -172,7 +173,7 @@ try { //load driver class - Class.forName(conf_.getProperty("hibernate.connection.driver_class")).newInstance(); + ClassLoading.forName(conf_.getProperty("hibernate.connection.driver_class"), this).newInstance(); } catch (InstantiationException e) { @@ -259,7 +260,7 @@ { for (String annotation : annotations) { - Class clazz = cl.loadClass(annotation); + Class<?> clazz = ClassLoading.loadClass(annotation, this); conf_.addAnnotatedClass(clazz); }