From 589c2a23643a9afac3fab8551b097142f70d72bb Mon Sep 17 00:00:00 2001
From: taktos9 <taktos9@136db618-7844-41ca-8ac1-fb3fd040db1d>
Date: Thu, 23 Oct 2008 11:20:48 +0000
Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/ea2ddl/trunk/ea2ddl@55 136db618-7844-41ca-8ac1-fb3fd040db1d
---
 ea2ddl-dao/pom.xml                                        |  9 ++++-----
 .../java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java |  9 ---------
 ea2ddl-dao/src/main/resources/dbflute.dicon               |  1 -
 .../jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java   | 15 +++++++--------
 ea2ddl-dao/src/test/resources/app-config.dicon            | 11 -----------
 ea2ddl-dao/src/test/resources/app.dicon                   |  1 -
 ea2ddl-dao/src/test/resources/app.properties              |  1 -
 ea2ddl-dao/src/{main => test}/resources/jdbc.dicon        |  0
 8 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 ea2ddl-dao/src/test/resources/app-config.dicon
 delete mode 100644 ea2ddl-dao/src/test/resources/app.properties
 rename ea2ddl-dao/src/{main => test}/resources/jdbc.dicon (100%)

diff --git a/ea2ddl-dao/pom.xml b/ea2ddl-dao/pom.xml
index 5eb6857..c93f471 100644
--- a/ea2ddl-dao/pom.xml
+++ b/ea2ddl-dao/pom.xml
@@ -14,11 +14,6 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>ea2ddl-common</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>org.seasar.container</groupId>
 			<artifactId>s2-extension</artifactId>
 		</dependency>
@@ -38,18 +33,22 @@
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-j2ee_1.4_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_3.0_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
index fe3cd8f..7198ef7 100644
--- a/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
+++ b/ea2ddl-dao/src/main/java/jp/sourceforge/ea2ddl/dao/exbhv/TPackageBhv.java
@@ -2,12 +2,9 @@ package jp.sourceforge.ea2ddl.dao.exbhv;
 
 import javax.persistence.EntityNotFoundException;
 
-import jp.sourceforge.ea2ddl.common.config.Config;
 import jp.sourceforge.ea2ddl.dao.cbean.TPackageCB;
 import jp.sourceforge.ea2ddl.dao.exentity.TPackage;
 
-import org.seasar.framework.container.annotation.tiger.Binding;
-
 /**
  * The behavior of t_package.
  * <p>
@@ -18,12 +15,6 @@ import org.seasar.framework.container.annotation.tiger.Binding;
  * @author DBFlute(AutoGenerator)
  */
 public class TPackageBhv extends jp.sourceforge.ea2ddl.dao.bsbhv.BsTPackageBhv {
-	private Config _config;
-
-	@Binding
-	public void setConfig(Config config) {
-		_config = config;
-	}
 
 	/**
 	 * パッケージツリーから対象のパッケージオブジェクトを検索する。
diff --git a/ea2ddl-dao/src/main/resources/dbflute.dicon b/ea2ddl-dao/src/main/resources/dbflute.dicon
index d711116..905a00a 100644
--- a/ea2ddl-dao/src/main/resources/dbflute.dicon
+++ b/ea2ddl-dao/src/main/resources/dbflute.dicon
@@ -4,7 +4,6 @@
 
 <components namespace="dbflute">
     <include path="j2ee.dicon"/>
-    <include path="app-config.dicon"/>
 
     <!-- S2Dao component. -->
     <component class="jp.sourceforge.ea2ddl.dao.allcommon.s2dao.S2DaoMetaDataFactoryImpl">
diff --git a/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java b/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
index 47b6186..d98bada 100644
--- a/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
+++ b/ea2ddl-dao/src/test/java/jp/sourceforge/ea2ddl/dao/exbhv/TObjectBhvTest.java
@@ -1,11 +1,10 @@
 package jp.sourceforge.ea2ddl.dao.exbhv;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
 import jp.sourceforge.ea2ddl.dao.exentity.TObject;
-import jp.sourceforge.ea2ddl.dao.exentity.TPackage;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,14 +19,14 @@ public class TObjectBhvTest {
 	TPackageBhv _pkgBhv;
 
 	@Test
-	public void testSelectEntityInteger() {
-		fail("まだ実装されていません");
+	public void testSelectList() {
+		final List<TObject> tableList = _bhv.selectList("ビュー/クラスビュー/ER図/EXAMPLEDB", "table", null);
+		assertTrue(0 < tableList.size());
 	}
 
 	@Test
-	public void testSelectListByStereotype() {
-		final TPackage pkg = _pkgBhv.selectPackage("クラスビュー/ER図/SIMPLEDB");
-		final List<TObject> tables = _bhv.selectListByStereotype(pkg, "table");
+	public void testSelectList_Note() {
+		final List<TObject> noteList = _bhv.selectList("ビュー/クラスビュー/ER図/EXAMPLEDB", null, "Note");
+		assertTrue(0 < noteList.size());
 	}
-
 }
diff --git a/ea2ddl-dao/src/test/resources/app-config.dicon b/ea2ddl-dao/src/test/resources/app-config.dicon
deleted file mode 100644
index 958db57..0000000
--- a/ea2ddl-dao/src/test/resources/app-config.dicon
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
-	"http://www.seasar.org/dtd/components24.dtd">
-<components>
-	<component name="config"
-		class="jp.sourceforge.ea2ddl.common.config.impl.ConfigImpl">
-		<initMethod name="load">
-			<arg>"app.properties"</arg>
-		</initMethod>
-	</component>
-</components>
\ No newline at end of file
diff --git a/ea2ddl-dao/src/test/resources/app.dicon b/ea2ddl-dao/src/test/resources/app.dicon
index 29fc770..537aaf6 100644
--- a/ea2ddl-dao/src/test/resources/app.dicon
+++ b/ea2ddl-dao/src/test/resources/app.dicon
@@ -2,7 +2,6 @@
 <!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
 	"http://www.seasar.org/dtd/components24.dtd">
 <components>
-  <include path="app-config.dicon"/>
   <include path="aop.dicon"/>
   <include path="dbflute.dicon"/>
 </components>
diff --git a/ea2ddl-dao/src/test/resources/app.properties b/ea2ddl-dao/src/test/resources/app.properties
deleted file mode 100644
index 8df53b4..0000000
--- a/ea2ddl-dao/src/test/resources/app.properties
+++ /dev/null
@@ -1 +0,0 @@
-root.package.name=\u30d3\u30e5\u30fc
\ No newline at end of file
diff --git a/ea2ddl-dao/src/main/resources/jdbc.dicon b/ea2ddl-dao/src/test/resources/jdbc.dicon
similarity index 100%
rename from ea2ddl-dao/src/main/resources/jdbc.dicon
rename to ea2ddl-dao/src/test/resources/jdbc.dicon
-- 
2.11.0