git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code style improvements.
[utils]
/
system
/
spring
/
src
/
main
/
java
/
org
/
wamblee
/
system
/
spring
/
component
/
DatasourceComponent.java
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 2b21a37bdc51701c266aa44729c261b922d3bda5..f0aa825ab37870ba01a0bd8180ac1e2e74cf2862 100644
(file)
--- 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
@@
-15,10
+15,11
@@
*/
package org.wamblee.system.spring.component;
*/
package org.wamblee.system.spring.component;
-import
org.springframework.core.io.ClassPathResource
;
+import
java.util.Properties
;
-import
org.springframework.jdbc.datasource.DriverManager
DataSource;
+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;
import org.wamblee.system.components.ORMappingConfig;
import org.wamblee.system.components.ORMappingConfig.DatabaseType;
import org.wamblee.system.core.AbstractComponent;
@@
-27,15
+28,6
@@
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.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;
/**
*
/**
*
@@
-57,7
+49,7
@@
public class DatasourceComponent extends AbstractComponent<DataSource> {
*
*
*/
*
*
*/
- public DatasourceComponent(String aName)
throws IOException
{
+ public DatasourceComponent(String aName) {
super(aName);
addRequiredInterface(PROPS);
super(aName);
addRequiredInterface(PROPS);