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=88bb065ee828a249d9dd8266ea71a69dc9cef56d;hpb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;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 88bb065e..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
@@ -1,31 +1,32 @@
 /*
- * Copyright 2008 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 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<String>() {
             @Override
             public String handleMySqlInnoDb() {