X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2Fcomponent%2FDatasourceComponent.java;h=f0aa825ab37870ba01a0bd8180ac1e2e74cf2862;hb=dec278a67997ea8e85d10662e31548afd8890ed3;hp=1b121bca40244e69010e4f37d581879c17a7db04;hpb=ddd261f331280640c5b53c7128230b629ebcd268;p=utils

diff --git a/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java
index 1b121bca..f0aa825a 100644
--- a/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/component/DatasourceComponent.java
@@ -1,24 +1,25 @@
 /*
- * 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.springframework.core.io.ClassPathResource;
+import java.util.Properties;
 
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import javax.sql.DataSource;
 
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.wamblee.system.components.ORMappingConfig;
 import org.wamblee.system.components.ORMappingConfig.DatabaseType;
 import org.wamblee.system.core.AbstractComponent;
@@ -27,50 +28,28 @@ import org.wamblee.system.core.DefaultRequiredInterface;
 import org.wamblee.system.core.ProvidedInterface;
 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.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
-import javax.sql.DataSource;
-
 
 /**
- * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
  */
 public class DatasourceComponent extends AbstractComponent<DataSource> {
-    /**
-     * DOCUMENT ME!
-     */
-    private static RequiredInterface PROPS = new DefaultRequiredInterface("dbprops",
-            Properties.class);
+    private static RequiredInterface PROPS = new DefaultRequiredInterface(
+        "dbprops", Properties.class);
 
-    /**
-     * DOCUMENT ME!
-     */
-    private static ProvidedInterface DATASOURCE = new DefaultProvidedInterface("datasource",
-            DataSource.class);
+    private static ProvidedInterface DATASOURCE = new DefaultProvidedInterface(
+        "datasource", DataSource.class);
 
-    /**
-     * DOCUMENT ME!
-     */
-    private static ProvidedInterface ORM_CONFIG = new DefaultProvidedInterface("ormconfig",
-            ORMappingConfig.class);
+    private static ProvidedInterface ORM_CONFIG = new DefaultProvidedInterface(
+        "ormconfig", ORMappingConfig.class);
 
-/**
+    /**
      * Creates a new DatasourceComponent object.
-     *
-     * @param aName DOCUMENT ME!
-     *
-     * @throws IOException DOCUMENT ME!
+     * 
+     * 
      */
-    public DatasourceComponent(String aName) throws IOException {
+    public DatasourceComponent(String aName) {
         super(aName);
 
         addRequiredInterface(PROPS);
@@ -78,25 +57,18 @@ public class DatasourceComponent extends AbstractComponent<DataSource> {
         addProvidedInterface(ORM_CONFIG);
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aScope DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     @Override
     protected DataSource doStart(Scope aScope) {
-        Properties              dbProps = aScope.getInterfaceImplementation(PROPS
-                .getProvider(), Properties.class);
-        DriverManagerDataSource ds      = new DriverManagerDataSource(dbProps
-                .getProperty("database.url"),
-                dbProps.getProperty("database.username"),
-                dbProps.getProperty("database.password"));
+        Properties dbProps = aScope.getInterfaceImplementation(PROPS
+            .getProvider(), Properties.class);
+        DriverManagerDataSource ds = new DriverManagerDataSource(dbProps
+            .getProperty("database.url"), dbProps
+            .getProperty("database.username"), dbProps
+            .getProperty("database.password"));
         addInterface(DATASOURCE, ds, aScope);
 
-        DatabaseType    type   = DatabaseType.valueOf(dbProps.getProperty(
-                    "database.type"));
+        DatabaseType type = DatabaseType.valueOf(dbProps
+            .getProperty("database.type"));
 
         ORMappingConfig config = new ORMappingConfig(true, type);
 
@@ -105,11 +77,6 @@ public class DatasourceComponent extends AbstractComponent<DataSource> {
         return ds;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aRuntime DOCUMENT ME!
-     */
     @Override
     protected void doStop(DataSource aRuntime) {
         // Empty.