X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2Fcomponent%2FHibernateComponent.java;h=9d5bb83bf6e38e9b03ccad4958906f46b89f24c1;hb=dec278a67997ea8e85d10662e31548afd8890ed3;hp=c52c87c3c4f849b3dfec4e4272ec2121bd55eac8;hpb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;p=utils diff --git a/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java index c52c87c3..9d5bb83b 100644 --- a/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java +++ b/system/spring/src/main/java/org/wamblee/system/spring/component/HibernateComponent.java @@ -15,17 +15,18 @@ */ package org.wamblee.system.spring.component; -import org.hibernate.SessionFactory; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import javax.sql.DataSource; + +import org.hibernate.SessionFactory; import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.MySQLInnoDBDialect; - import org.springframework.orm.hibernate3.HibernateTemplate; - import org.springframework.transaction.PlatformTransactionManager; - import org.wamblee.persistence.hibernate.HibernateMappingFiles; - import org.wamblee.system.components.ORMappingConfig; import org.wamblee.system.components.ORMappingConfig.DatabaseType; import org.wamblee.system.core.DefaultProvidedInterface; @@ -35,14 +36,6 @@ import org.wamblee.system.core.RequiredInterface; import org.wamblee.system.core.Scope; import org.wamblee.system.spring.SpringComponent; -import java.io.IOException; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.sql.DataSource; - /** * * @author $author$ @@ -57,7 +50,7 @@ public class HibernateComponent extends SpringComponent { private static final String HIBERNATE_SPRING_CONFIG = "spring/org.wamblee.system.spring.component.hibernate.xml"; - private final RequiredInterface CONFIG = new DefaultRequiredInterface( + private final RequiredInterface config = new DefaultRequiredInterface( "config", ORMappingConfig.class); /** @@ -65,23 +58,23 @@ public class HibernateComponent extends SpringComponent { * * */ - public HibernateComponent(String aName) throws IOException { + public HibernateComponent(String aName) { super(aName, new String[] { HIBERNATE_SPRING_CONFIG }, createProvided(), createRequired()); Properties props = new Properties(); addProperties(HIBERNATE_PROPS_KEY, props); - addRequiredInterface(CONFIG); + addRequiredInterface(config); } @Override protected Scope doStart(Scope aExternalScope) { - ORMappingConfig config = aExternalScope.getInterfaceImplementation( - CONFIG.getProvider(), ORMappingConfig.class); - setProperty(HIBERNATE_SCHEMAUPDATE_PROP, "" + config.isSchemaUpdate()); + ORMappingConfig orMappingConfig = aExternalScope.getInterfaceImplementation( + config.getProvider(), ORMappingConfig.class); + setProperty(HIBERNATE_SCHEMAUPDATE_PROP, "" + orMappingConfig.isSchemaUpdate()); - DatabaseType db = config.getType(); + DatabaseType db = orMappingConfig.getType(); String dialect = db.handleCases(new DatabaseType.Switch() { @Override public String handleMySqlInnoDb() {