From 95901c797a0473979df055e53555f1b1022b2bd0 Mon Sep 17 00:00:00 2001
From: taktos9 <taktos9@136db618-7844-41ca-8ac1-fb3fd040db1d>
Date: Mon, 13 Oct 2008 18:10:11 +0000
Subject: [PATCH] =?utf8?q?"https://svn.sourceforge.jp/svnroot/ea2ddl"=20?=
 =?utf8?q?=E3=81=AB=E3=83=97=E3=83=AD=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88?=
 =?utf8?q?=20"ea2ddl-common"=20=E3=82=92=E5=85=B1=E7=94=A8?=
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@9 136db618-7844-41ca-8ac1-fb3fd040db1d
---
 ea2ddl-common/.classpath                           | 10 ++++
 ea2ddl-common/.project                             | 23 +++++++++
 .../.settings/org.eclipse.core.resources.prefs     |  3 ++
 ea2ddl-common/.settings/org.eclipse.jdt.core.prefs |  5 ++
 .../.settings/org.maven.ide.eclipse.prefs          |  8 ++++
 ea2ddl-common/pom.xml                              | 43 +++++++++++++++++
 .../sourceforge/ea2ddl/common/config/Config.java   | 14 ++++++
 .../ea2ddl/common/config/impl/ConfigImpl.java      | 56 ++++++++++++++++++++++
 .../ea2ddl/common/config/impl/ConfigImplTest.java  | 27 +++++++++++
 ea2ddl-common/src/test/resources/app-config.dicon  | 10 ++++
 ea2ddl-common/src/test/resources/app.dicon         |  6 +++
 ea2ddl-common/src/test/resources/app.properties    |  1 +
 ea2ddl-common/src/test/resources/jdbc.dicon        | 48 +++++++++++++++++++
 ea2ddl-common/src/test/resources/log4j.properties  |  7 +++
 ea2ddl-common/src/test/resources/s2junit4.dicon    | 33 +++++++++++++
 15 files changed, 294 insertions(+)
 create mode 100644 ea2ddl-common/.classpath
 create mode 100644 ea2ddl-common/.project
 create mode 100644 ea2ddl-common/.settings/org.eclipse.core.resources.prefs
 create mode 100644 ea2ddl-common/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 ea2ddl-common/.settings/org.maven.ide.eclipse.prefs
 create mode 100644 ea2ddl-common/pom.xml
 create mode 100644 ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/Config.java
 create mode 100644 ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImpl.java
 create mode 100644 ea2ddl-common/src/test/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImplTest.java
 create mode 100644 ea2ddl-common/src/test/resources/app-config.dicon
 create mode 100644 ea2ddl-common/src/test/resources/app.dicon
 create mode 100644 ea2ddl-common/src/test/resources/app.properties
 create mode 100644 ea2ddl-common/src/test/resources/jdbc.dicon
 create mode 100644 ea2ddl-common/src/test/resources/log4j.properties
 create mode 100644 ea2ddl-common/src/test/resources/s2junit4.dicon

diff --git a/ea2ddl-common/.classpath b/ea2ddl-common/.classpath
new file mode 100644
index 0000000..425cd16
--- /dev/null
+++ b/ea2ddl-common/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/ea2ddl-common/.project b/ea2ddl-common/.project
new file mode 100644
index 0000000..4746c02
--- /dev/null
+++ b/ea2ddl-common/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ea2ddl-common</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/ea2ddl-common/.settings/org.eclipse.core.resources.prefs b/ea2ddl-common/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..af87ac4
--- /dev/null
+++ b/ea2ddl-common/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Tue Oct 14 01:32:03 JST 2008
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ea2ddl-common/.settings/org.eclipse.jdt.core.prefs b/ea2ddl-common/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..7004a7c
--- /dev/null
+++ b/ea2ddl-common/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Tue Oct 14 01:31:03 JST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/ea2ddl-common/.settings/org.maven.ide.eclipse.prefs b/ea2ddl-common/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 0000000..78faf52
--- /dev/null
+++ b/ea2ddl-common/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Oct 14 01:31:03 JST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
diff --git a/ea2ddl-common/pom.xml b/ea2ddl-common/pom.xml
new file mode 100644
index 0000000..4765221
--- /dev/null
+++ b/ea2ddl-common/pom.xml
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<artifactId>ea2ddl-parent</artifactId>
+		<groupId>jp.sourceforge.ea2ddl</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>jp.sourceforge.ea2ddl</groupId>
+	<artifactId>ea2ddl-common</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>Enterprise Archetect to DDL</name>
+	<description>Enterprise Archetect to DDL</description>
+	<url>http://ea2ddl.sourceforge.jp/</url>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.seasar.container</groupId>
+			<artifactId>s2-extension</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.seasar.container</groupId>
+			<artifactId>s2-tiger</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-j2ee_1.4_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_3.0_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jpa_3.0_spec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/Config.java b/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/Config.java
new file mode 100644
index 0000000..28c2365
--- /dev/null
+++ b/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/Config.java
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+package jp.sourceforge.ea2ddl.common.config;
+
+/**
+ * @author takiguchi
+ *
+ */
+public interface Config {
+
+	String getProperty(String key);
+	String getProperty(String key, String defaultValue);
+}
diff --git a/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImpl.java b/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImpl.java
new file mode 100644
index 0000000..ea121e2
--- /dev/null
+++ b/ea2ddl-common/src/main/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImpl.java
@@ -0,0 +1,56 @@
+/**
+ * 
+ */
+package jp.sourceforge.ea2ddl.common.config.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+
+import jp.sourceforge.ea2ddl.common.config.Config;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author takiguchi
+ *
+ */
+public class ConfigImpl implements Config {
+	private static final Log _log = LogFactory.getLog(ConfigImpl.class);
+
+	private Properties _prop = new Properties();
+
+	public void load(String configPath) {
+		InputStream in = null;
+		try {
+			in = new URL(configPath).openStream();
+		} catch (MalformedURLException e) {
+		} catch (IOException e) {
+			_log.info("Failed to read resource:", e);
+		}
+		if (in == null) {
+			in = Thread.currentThread().getContextClassLoader().getResourceAsStream(configPath);
+		}
+		if (in != null) {
+			try {
+				_prop.load(in);
+			} catch (IOException e) {
+				_log.info("Failed to read resource:" + e);
+			}
+		}
+	}
+
+	@Override
+	public String getProperty(String key) {
+		return _prop.getProperty(key);
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		return _prop.getProperty(key, defaultValue);
+	}
+
+}
diff --git a/ea2ddl-common/src/test/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImplTest.java b/ea2ddl-common/src/test/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImplTest.java
new file mode 100644
index 0000000..c4473e1
--- /dev/null
+++ b/ea2ddl-common/src/test/java/jp/sourceforge/ea2ddl/common/config/impl/ConfigImplTest.java
@@ -0,0 +1,27 @@
+package jp.sourceforge.ea2ddl.common.config.impl;
+
+import static org.junit.Assert.*;
+import jp.sourceforge.ea2ddl.common.config.Config;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.seasar.framework.unit.Seasar2;
+import org.seasar.framework.unit.annotation.RootDicon;
+
+@RunWith(Seasar2.class)
+@RootDicon("app.dicon")
+public class ConfigImplTest {
+
+	Config _config;
+
+	@Test
+	public void testGetPropertyString() {
+		assertEquals("ビュー", _config.getProperty("root.package.name"));
+	}
+
+	@Test
+	public void testGetPropertyStringString() {
+		assertEquals("テスト", _config.getProperty("test.key"));
+	}
+
+}
diff --git a/ea2ddl-common/src/test/resources/app-config.dicon b/ea2ddl-common/src/test/resources/app-config.dicon
new file mode 100644
index 0000000..7bce5e4
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/app-config.dicon
@@ -0,0 +1,10 @@
+<?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 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-common/src/test/resources/app.dicon b/ea2ddl-common/src/test/resources/app.dicon
new file mode 100644
index 0000000..404397d
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/app.dicon
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
+	"http://www.seasar.org/dtd/components24.dtd">
+<components>
+  <include path="app-config.dicon"/>
+</components>
diff --git a/ea2ddl-common/src/test/resources/app.properties b/ea2ddl-common/src/test/resources/app.properties
new file mode 100644
index 0000000..8df53b4
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/app.properties
@@ -0,0 +1 @@
+root.package.name=\u30d3\u30e5\u30fc
\ No newline at end of file
diff --git a/ea2ddl-common/src/test/resources/jdbc.dicon b/ea2ddl-common/src/test/resources/jdbc.dicon
new file mode 100644
index 0000000..cd3ed1a
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/jdbc.dicon
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
+	"http://www.seasar.org/dtd/components24.dtd">
+<components namespace="jdbc">
+	<include path="jta.dicon"/>
+
+	<!-- for MS-Access -->
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"sun.jdbc.odbc.JdbcOdbcDriver"
+		</property>
+		<property name="URL">
+			"jdbc:odbc:simpledb"
+		</property>
+		<property name="user">"sa"</property>
+		<property name="password">""</property>
+		<initMethod name="addProperty">
+			<arg>"charSet"</arg>
+			<arg>"MS932"</arg>
+		</initMethod>
+	</component>
+
+	<component name="connectionPool"
+		class="org.seasar.extension.dbcp.impl.ConnectionPoolImpl">
+		<property name="timeout">600</property>
+		<property name="maxPoolSize">10</property>
+		<property name="allowLocalTx">true</property>
+		<destroyMethod name="close"/>
+	</component>
+
+	<component name="DataSource"
+		class="org.seasar.extension.dbcp.impl.DataSourceImpl"
+	/>
+
+	<!-- from JNDI -->
+	<!--
+	<component name="DataSource"
+		class="javax.sql.DataSource">
+		@org.seasar.extension.j2ee.JndiResourceLocator@lookup("java:comp/env/jdbc/DataSource")
+	</component>
+	-->
+
+	<!--
+	<component name="dataSource"
+		class="org.seasar.extension.datasource.impl.SelectableDataSourceProxy"/>
+	-->
+</components>
\ No newline at end of file
diff --git a/ea2ddl-common/src/test/resources/log4j.properties b/ea2ddl-common/src/test/resources/log4j.properties
new file mode 100644
index 0000000..41c3ae5
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/log4j.properties
@@ -0,0 +1,7 @@
+log4j.rootLogger=INFO,STDOUT
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.ImmediateFlush=true
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+
+log4j.category.org.seasar=DEBUG
diff --git a/ea2ddl-common/src/test/resources/s2junit4.dicon b/ea2ddl-common/src/test/resources/s2junit4.dicon
new file mode 100644
index 0000000..9e857c0
--- /dev/null
+++ b/ea2ddl-common/src/test/resources/s2junit4.dicon
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
+	"http://www.seasar.org/dtd/components24.dtd">
+<components namespace="s2junit4">
+	
+	<component name="context" class="org.seasar.framework.unit.impl.InternalTestContextImpl"/>
+
+	<component class="org.seasar.framework.unit.impl.DataAccessorImpl"/>
+
+	<component class="org.seasar.framework.unit.impl.ConfigFileIncluderImpl">
+		<initMethod name="addConfigFile">
+			<arg>"javaee5.dicon"</arg>
+		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>context.testClassShortName + ".dicon"</arg>
+		</initMethod>
+	</component>
+		
+	<component class="org.seasar.framework.unit.impl.TestDataPreparerImpl">
+		<initMethod name="addTestDataXlsPath">
+			<arg>context.testClassShortName + "_" + context.testMethodName + ".xls"</arg>
+		</initMethod>
+		<initMethod name="addTestDataXlsPath">
+			<arg>context.testClassShortName + ".xls"</arg>
+		</initMethod>
+	</component>
+
+	<component class="org.seasar.framework.unit.impl.ExpectedDataReaderImpl">
+		<initMethod name="addExpectedDataXlsPath">
+			<arg>context.testClassShortName + "_" + context.testMethodName + "_Expected" + ".xls"</arg>
+		</initMethod>
+	</component>
+</components>
\ No newline at end of file
-- 
2.11.0