Author: tolusha Date: 2012-03-03 07:29:37 -0500 (Sat, 03 Mar 2012) New Revision: 5775 Modified: core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java core/branches/2.4.6-GA-JBAS7/pom.xml Log: EXOJCR-1777: applied patches Modified: core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java =================================================================== --- core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-03-03 12:27:01 UTC (rev 5774) +++ core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2012-03-03 12:29:37 UTC (rev 5775) @@ -20,6 +20,7 @@ import org.exoplatform.commons.utils.PrivilegedFileHelper; import org.exoplatform.commons.utils.SecurityHelper; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.configuration.ConfigurationException; import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.container.xml.InitParams; @@ -481,7 +482,7 @@ Connection conn = null; try { - Class.forName(connectionProperties.get(DRIVER_NAME)); + Tools.forName(connectionProperties.get(DRIVER_NAME), this); conn = SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>() { Modified: core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java =================================================================== --- core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-03-03 12:27:01 UTC (rev 5774) +++ core/branches/2.4.6-GA-JBAS7/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2012-03-03 12:29:37 UTC (rev 5775) @@ -21,6 +21,7 @@ import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.commons.utils.SecurityHelper; +import org.exoplatform.commons.utils.Tools; import org.exoplatform.container.ExoContainer; import org.exoplatform.container.component.ComponentPlugin; import org.exoplatform.container.component.ComponentRequestLifecycle; @@ -173,7 +174,7 @@ try { //load driver class - Class.forName(conf_.getProperty("hibernate.connection.driver_class")).newInstance(); + Tools.forName(conf_.getProperty("hibernate.connection.driver_class"), this).newInstance(); } catch (InstantiationException e) { @@ -260,7 +261,7 @@ { for (String annotation : annotations) { - Class clazz = cl.loadClass(annotation); + Class<?> clazz = Tools.loadClass(annotation, this); conf_.addAnnotatedClass(clazz); } Modified: core/branches/2.4.6-GA-JBAS7/pom.xml =================================================================== --- core/branches/2.4.6-GA-JBAS7/pom.xml 2012-03-03 12:27:01 UTC (rev 5774) +++ core/branches/2.4.6-GA-JBAS7/pom.xml 2012-03-03 12:29:37 UTC (rev 5775) @@ -39,7 +39,7 @@ <exo.product.specification>2.4</exo.product.specification> <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version> - <org.exoplatform.kernel.version>2.3.6-GA-JBAS7</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.3.6-GA-JBAS7-SNAPSHOT</org.exoplatform.kernel.version> <!-- Plugins updates --> <version.source.plugin>2.1.2</version.source.plugin>