From: taktos9 Date: Fri, 16 Dec 2011 02:20:16 +0000 (+0900) Subject: ディレクトリトップで mvn package で成果物を作れるようにした X-Git-Tag: ea2ddl-0.0.3~9 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c2ab82fab5f61d31dbb5a07069bfc4416a64471;p=ea2ddl%2Fea2ddl.git ディレクトリトップで mvn package で成果物を作れるようにした --- diff --git a/ea2ddl-ddl/lib/aopalliance-1.0.jar b/ea2ddl-ddl/lib/aopalliance-1.0.jar deleted file mode 100644 index 578b1a0..0000000 Binary files a/ea2ddl-ddl/lib/aopalliance-1.0.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/commons-collections-3.2.jar b/ea2ddl-ddl/lib/commons-collections-3.2.jar deleted file mode 100644 index 75580be..0000000 Binary files a/ea2ddl-ddl/lib/commons-collections-3.2.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/commons-lang-2.3.jar b/ea2ddl-ddl/lib/commons-lang-2.3.jar deleted file mode 100644 index c33b353..0000000 Binary files a/ea2ddl-ddl/lib/commons-lang-2.3.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/commons-logging-1.1.jar b/ea2ddl-ddl/lib/commons-logging-1.1.jar deleted file mode 100644 index 2ff9bbd..0000000 Binary files a/ea2ddl-ddl/lib/commons-logging-1.1.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/easymock-2.2.jar b/ea2ddl-ddl/lib/easymock-2.2.jar deleted file mode 100644 index c4159f5..0000000 Binary files a/ea2ddl-ddl/lib/easymock-2.2.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/freemarker-2.3.13.jar b/ea2ddl-ddl/lib/freemarker-2.3.13.jar deleted file mode 100644 index 5b8192e..0000000 Binary files a/ea2ddl-ddl/lib/freemarker-2.3.13.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/geronimo-ejb_3.0_spec-1.0.jar b/ea2ddl-ddl/lib/geronimo-ejb_3.0_spec-1.0.jar deleted file mode 100644 index 7759185..0000000 Binary files a/ea2ddl-ddl/lib/geronimo-ejb_3.0_spec-1.0.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/geronimo-j2ee_1.4_spec-1.0.jar b/ea2ddl-ddl/lib/geronimo-j2ee_1.4_spec-1.0.jar deleted file mode 100644 index 6c30f12..0000000 Binary files a/ea2ddl-ddl/lib/geronimo-j2ee_1.4_spec-1.0.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/geronimo-jpa_3.0_spec-1.0.jar b/ea2ddl-ddl/lib/geronimo-jpa_3.0_spec-1.0.jar deleted file mode 100644 index e8917c5..0000000 Binary files a/ea2ddl-ddl/lib/geronimo-jpa_3.0_spec-1.0.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/geronimo-jta_1.1_spec-1.0.jar b/ea2ddl-ddl/lib/geronimo-jta_1.1_spec-1.0.jar deleted file mode 100644 index b9d7cc7..0000000 Binary files a/ea2ddl-ddl/lib/geronimo-jta_1.1_spec-1.0.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/javassist-3.4.ga.jar b/ea2ddl-ddl/lib/javassist-3.4.ga.jar deleted file mode 100644 index a6bde77..0000000 Binary files a/ea2ddl-ddl/lib/javassist-3.4.ga.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/junit-4.4.jar b/ea2ddl-ddl/lib/junit-4.4.jar deleted file mode 100644 index 649b0b3..0000000 Binary files a/ea2ddl-ddl/lib/junit-4.4.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/junit-addons-1.4.jar b/ea2ddl-ddl/lib/junit-addons-1.4.jar deleted file mode 100644 index c344624..0000000 Binary files a/ea2ddl-ddl/lib/junit-addons-1.4.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/log4j-1.2.14.jar b/ea2ddl-ddl/lib/log4j-1.2.14.jar deleted file mode 100644 index 6251307..0000000 Binary files a/ea2ddl-ddl/lib/log4j-1.2.14.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/ognl-2.6.9-patch-20070908.jar b/ea2ddl-ddl/lib/ognl-2.6.9-patch-20070908.jar deleted file mode 100644 index 418f322..0000000 Binary files a/ea2ddl-ddl/lib/ognl-2.6.9-patch-20070908.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/poi-3.0.2-FINAL.jar b/ea2ddl-ddl/lib/poi-3.0.2-FINAL.jar deleted file mode 100644 index fda0431..0000000 Binary files a/ea2ddl-ddl/lib/poi-3.0.2-FINAL.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/s2-dao-1.0.47.jar b/ea2ddl-ddl/lib/s2-dao-1.0.47.jar deleted file mode 100644 index 52e1597..0000000 Binary files a/ea2ddl-ddl/lib/s2-dao-1.0.47.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/s2-dao-tiger-1.0.47.jar b/ea2ddl-ddl/lib/s2-dao-tiger-1.0.47.jar deleted file mode 100644 index c6a56a0..0000000 Binary files a/ea2ddl-ddl/lib/s2-dao-tiger-1.0.47.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/s2-extension-2.4.30.jar b/ea2ddl-ddl/lib/s2-extension-2.4.30.jar deleted file mode 100644 index b1ae461..0000000 Binary files a/ea2ddl-ddl/lib/s2-extension-2.4.30.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/s2-framework-2.4.30.jar b/ea2ddl-ddl/lib/s2-framework-2.4.30.jar deleted file mode 100644 index 231836b..0000000 Binary files a/ea2ddl-ddl/lib/s2-framework-2.4.30.jar and /dev/null differ diff --git a/ea2ddl-ddl/lib/s2-tiger-2.4.30.jar b/ea2ddl-ddl/lib/s2-tiger-2.4.30.jar deleted file mode 100644 index 1cee487..0000000 Binary files a/ea2ddl-ddl/lib/s2-tiger-2.4.30.jar and /dev/null differ diff --git a/ea2ddl-parent/.classpath b/ea2ddl-dist/.classpath similarity index 100% rename from ea2ddl-parent/.classpath rename to ea2ddl-dist/.classpath diff --git a/ea2ddl-dist/.gitignore b/ea2ddl-dist/.gitignore new file mode 100644 index 0000000..91230db --- /dev/null +++ b/ea2ddl-dist/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/ea2ddl-parent/.project b/ea2ddl-dist/.project similarity index 100% rename from ea2ddl-parent/.project rename to ea2ddl-dist/.project diff --git a/ea2ddl-parent/.settings/org.eclipse.core.resources.prefs b/ea2ddl-dist/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from ea2ddl-parent/.settings/org.eclipse.core.resources.prefs rename to ea2ddl-dist/.settings/org.eclipse.core.resources.prefs diff --git a/ea2ddl-parent/.settings/org.eclipse.jdt.core.prefs b/ea2ddl-dist/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ea2ddl-parent/.settings/org.eclipse.jdt.core.prefs rename to ea2ddl-dist/.settings/org.eclipse.jdt.core.prefs diff --git a/ea2ddl-parent/.settings/org.maven.ide.eclipse.prefs b/ea2ddl-dist/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from ea2ddl-parent/.settings/org.maven.ide.eclipse.prefs rename to ea2ddl-dist/.settings/org.maven.ide.eclipse.prefs diff --git a/ea2ddl-dist/assembly.xml b/ea2ddl-dist/assembly.xml new file mode 100644 index 0000000..257df46 --- /dev/null +++ b/ea2ddl-dist/assembly.xml @@ -0,0 +1,20 @@ + + + assemble + + zip + + + + + runtime + lib + + + + + dist/ea2ddl + / + + + diff --git a/ea2ddl-parent/build.xml b/ea2ddl-dist/build.xml similarity index 100% rename from ea2ddl-parent/build.xml rename to ea2ddl-dist/build.xml diff --git a/ea2ddl-parent/dist/ea2ddl/LICENSE.txt b/ea2ddl-dist/dist/ea2ddl/LICENSE.txt similarity index 100% rename from ea2ddl-parent/dist/ea2ddl/LICENSE.txt rename to ea2ddl-dist/dist/ea2ddl/LICENSE.txt diff --git a/ea2ddl-parent/dist/ea2ddl/README.txt b/ea2ddl-dist/dist/ea2ddl/README.txt similarity index 100% rename from ea2ddl-parent/dist/ea2ddl/README.txt rename to ea2ddl-dist/dist/ea2ddl/README.txt diff --git a/ea2ddl-ddl/build-ea2ddl.xml b/ea2ddl-dist/dist/ea2ddl/build-ea2ddl.xml similarity index 100% rename from ea2ddl-ddl/build-ea2ddl.xml rename to ea2ddl-dist/dist/ea2ddl/build-ea2ddl.xml diff --git a/ea2ddl-parent/dist/ea2ddl/config/dictionary.properties b/ea2ddl-dist/dist/ea2ddl/config/dictionary.properties similarity index 100% rename from ea2ddl-parent/dist/ea2ddl/config/dictionary.properties rename to ea2ddl-dist/dist/ea2ddl/config/dictionary.properties diff --git a/ea2ddl-parent/dist/ea2ddl/config/ea2ddl.properties b/ea2ddl-dist/dist/ea2ddl/config/ea2ddl.properties similarity index 100% rename from ea2ddl-parent/dist/ea2ddl/config/ea2ddl.properties rename to ea2ddl-dist/dist/ea2ddl/config/ea2ddl.properties diff --git a/ea2ddl-parent/dist/ea2ddl/config/jdbc.dicon b/ea2ddl-dist/dist/ea2ddl/config/jdbc.dicon similarity index 100% rename from ea2ddl-parent/dist/ea2ddl/config/jdbc.dicon rename to ea2ddl-dist/dist/ea2ddl/config/jdbc.dicon diff --git a/ea2ddl-ddl/templates/classification.ftl b/ea2ddl-dist/dist/ea2ddl/templates/classification.ftl similarity index 100% rename from ea2ddl-ddl/templates/classification.ftl rename to ea2ddl-dist/dist/ea2ddl/templates/classification.ftl diff --git a/ea2ddl-ddl/templates/ddl-mysql.ftl b/ea2ddl-dist/dist/ea2ddl/templates/ddl-mysql.ftl similarity index 100% rename from ea2ddl-ddl/templates/ddl-mysql.ftl rename to ea2ddl-dist/dist/ea2ddl/templates/ddl-mysql.ftl diff --git a/ea2ddl-ddl/templates/ddl-ora.ftl b/ea2ddl-dist/dist/ea2ddl/templates/ddl-ora.ftl similarity index 100% rename from ea2ddl-ddl/templates/ddl-ora.ftl rename to ea2ddl-dist/dist/ea2ddl/templates/ddl-ora.ftl diff --git a/ea2ddl-dist/pom.xml b/ea2ddl-dist/pom.xml new file mode 100644 index 0000000..5931e95 --- /dev/null +++ b/ea2ddl-dist/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + jp.sourceforge.ea2ddl + ea2ddl-parent + 0.0.3-SNAPSHOT + + ea2ddl-dist + pom + + Packaging Enterprise Architect to DDL + Enterprise Architect to DDL + + + jp.sourceforge.ea2ddl + ea2ddl-ddl + ${project.version} + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assembly.xml + + + + + make-assembly + package + + single + + + + + + + + + diff --git a/ea2ddl-parent/schema/exampledb.eap b/ea2ddl-dist/schema/exampledb.eap similarity index 100% rename from ea2ddl-parent/schema/exampledb.eap rename to ea2ddl-dist/schema/exampledb.eap diff --git a/ea2ddl-parent/dist/ea2ddl/build-ea2ddl.xml b/ea2ddl-parent/dist/ea2ddl/build-ea2ddl.xml deleted file mode 100644 index d462499..0000000 --- a/ea2ddl-parent/dist/ea2ddl/build-ea2ddl.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ea2ddl-parent/dist/ea2ddl/templates/classification.ftl b/ea2ddl-parent/dist/ea2ddl/templates/classification.ftl deleted file mode 100644 index 4ba0f71..0000000 --- a/ea2ddl-parent/dist/ea2ddl/templates/classification.ftl +++ /dev/null @@ -1,4 +0,0 @@ -<#list classificationList as cls> -${cls} - - \ No newline at end of file diff --git a/ea2ddl-parent/dist/ea2ddl/templates/ddl-mysql.ftl b/ea2ddl-parent/dist/ea2ddl/templates/ddl-mysql.ftl deleted file mode 100644 index 4d03831..0000000 --- a/ea2ddl-parent/dist/ea2ddl/templates/ddl-mysql.ftl +++ /dev/null @@ -1,57 +0,0 @@ -<#comment> -<#list tableList as table> -<#list table.foreignKeyList as fk>ALTER TABLE ${table.name} DROP CONSTRAINT ${fk.name} -; - - -<#list tableList as table> -DROP TABLE ${table.name}; - - - -<#list tableList as table> -CREATE TABLE ${table.name} ( -<#list table.columnList as column> ${column.name} ${column.definition}<#if column_has_next>, - -<#if !table.suppressCommonColumn> - , create_user VARCHAR(20) NOT NULL - , create_datetime DATETIME NOT NULL - , update_user VARCHAR(20) NOT NULL - , update_datetime DATETIME NOT NULL - , version_no INTEGER NOT NULL - -) -; -<#if table.primaryKey??>ALTER TABLE ${table.name} ADD CONSTRAINT PRIMARY KEY - (<#list table.primaryKey.columnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - -<#list table.uniqueList as unique>ALTER TABLE ${table.name} ADD CONSTRAINT UNIQUE ${unique.name} - (<#list unique.columnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - -<#list table.indexList as index>CREATE INDEX ${index.name} ON ${table.name} - (<#list index.columnList as columnName>${columnName}<#if columnName_has_next>,) -; - - -<#if table.alias?? || table.note??> -COMMENT ON TABLE ${table.name} IS '<#if table.alias??>${table.alias}:<#if table.note??>${table.note}' -; - -<#list table.columnList as column> -<#if column.alias?? || column.note??> -COMMENT ON COLUMN ${table.name}.${column.name} IS '<#if column.alias??>${column.alias}:<#if column.note??>${column.note}' -; - - - - - -<#list tableList as table> -<#list table.foreignKeyList as fk>ALTER TABLE ${table.name} ADD CONSTRAINT ${fk.name} - FOREIGN KEY (<#list fk.columnNameList as columnName>${columnName}<#if columnName_has_next>,) - REFERENCES ${fk.targetTable} (<#list fk.targetColumnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - - \ No newline at end of file diff --git a/ea2ddl-parent/dist/ea2ddl/templates/ddl.ftl b/ea2ddl-parent/dist/ea2ddl/templates/ddl.ftl deleted file mode 100644 index 1ae4af5..0000000 --- a/ea2ddl-parent/dist/ea2ddl/templates/ddl.ftl +++ /dev/null @@ -1,56 +0,0 @@ -<#comment> -<#list tableList as table> -<#list table.foreignKeyList as fk>ALTER TABLE ${table.name} DROP CONSTRAINT ${fk.name} -; - - -<#list tableList as table> -DROP TABLE ${table.name}; - - - -<#list tableList as table> -CREATE TABLE ${table.name} ( -<#list table.columnList as column> ${column.name} ${column.definition}<#if column_has_next>, - -<#if !table.suppressCommonColumn> - , CREATE_USER VARCHAR2(20) NOT NULL - , CREATE_DATETIME DATE NOT NULL - , UPDATE_USER VARCHAR2(20) NOT NULL - , UPDATE_DATETIME DATE NOT NULL - , VERSION_NO NUMBER(8) NOT NULL - -) -; -<#if table.primaryKey??>ALTER TABLE ${table.name} ADD CONSTRAINT ${table.primaryKey.name} - PRIMARY KEY (<#list table.primaryKey.columnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - -<#list table.uniqueList as unique>ALTER TABLE ${table.name} ADD CONSTRAINT ${unique.name} - UNIQUE (<#list unique.columnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - -<#list table.indexList as index>CREATE INDEX ${index.name} ON ${table.name} - (<#list index.columnList as columnName>${columnName}<#if columnName_has_next>,) -; - -<#if table.alias?? || table.note??> -COMMENT ON TABLE ${table.name} IS '<#if table.alias??>${table.alias}:<#if table.note??>${table.note}' -; - -<#list table.columnList as column> -<#if column.alias?? || column.note??> -COMMENT ON COLUMN ${table.name}.${column.name} IS '<#if column.alias??>${column.alias}:<#if column.note??>${column.note}' -; - - - - - -<#list tableList as table> -<#list table.foreignKeyList as fk>ALTER TABLE ${table.name} ADD CONSTRAINT ${fk.name} - FOREIGN KEY (<#list fk.columnNameList as columnName>${columnName}<#if columnName_has_next>,) - REFERENCES ${fk.targetTable} (<#list fk.targetColumnNameList as columnName>${columnName}<#if columnName_has_next>,) -; - - \ No newline at end of file diff --git a/ea2ddl-parent/pom.xml b/ea2ddl-parent/pom.xml deleted file mode 100644 index 78665ec..0000000 --- a/ea2ddl-parent/pom.xml +++ /dev/null @@ -1,255 +0,0 @@ - - 4.0.0 - jp.sourceforge.ea2ddl - ea2ddl-parent - 0.0.2-SNAPSHOT - pom - - Enterprise Architect to DDL - Enterprise Architect to DDL - http://ea2ddl.sourceforge.jp/ - 2008 - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - scm:svn:https://svn.sourceforge.jp/svnroot/ea2ddl/trunk/ea2ddl-parent - scm:svn:https://svn.sourceforge.jp/svnroot/ea2ddl/trunk/ea2ddl-parent/ - http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi/?root=ea2ddl - - - ../ea2ddl-common - ../ea2ddl-dao - ../ea2ddl-comment - ../ea2ddl-ddl - - - - maven.seasar.org - The Seasar Foundation Maven2 Repository - http://maven.seasar.org/maven2 - - - - - - - maven-compiler-plugin - - UTF-8 - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-source-plugin - - - package - - jar - - - - - - maven-javadoc-plugin - - - package - - jar - - - - - 1.5 - UTF-8 - UTF-8 - UTF-8 - ja - true - -J-Xmx512m - - http://java.sun.com/j2se/1.5.0/ja/docs/ja/api/ - http://java.sun.com/j2ee/1.4/docs/api/ - http://aopalliance.sourceforge.net/doc/ - - - - - org.apache.maven.plugins - maven-surefire-plugin - - once - - -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m - - - - - - - - - 2.4.30 - - - - - junit - junit - 4.4 - test - - - junit-addons - junit-addons - 1.4 - jar - test - - - junit-addons - junit-addons-runner - - - xerces - xercesImpl - - - xerces - xmlParserAPIs - - - - - log4j - log4j - 1.2.14 - - - commons-logging - commons-logging - 1.1 - - - avalon-framework - avalon-framework - - - logkit - logkit - - - log4j - log4j - - - servlet-api - javax.servlet - - - - - commons-lang - commons-lang - 2.3 - - - commons-collections - commons-collections - 3.2 - - - - - - - org.seasar.container - s2-extension - ${s2.version} - jar - - - poi - poi - - - - - org.seasar.container - s2-tiger - ${s2.version} - jar - - - poi - poi - - - - - - org.apache.geronimo.specs - geronimo-j2ee_1.4_spec - 1.0 - jar - provided - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0 - jar - provided - - - org.apache.geronimo.specs - geronimo-jpa_3.0_spec - 1.0 - jar - provided - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.0 - jar - provided - - - org.apache.poi - poi - 3.0.2-FINAL - - - org.seasar.dbflute - dbflute - 0.8.1 - - - org.apache.ant - ant - 1.7.1 - - - org.freemarker - freemarker - 2.3.13 - - - org.seasar.dbflute - dbflute-runtime - 0.9.3 - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index ed789e9..4143ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ ea2ddl-dao ea2ddl-comment ea2ddl-ddl + ea2ddl-dist