From b37b082cc6289393609d1534fcbfda60292fbd39 Mon Sep 17 00:00:00 2001 From: taktos9 Date: Thu, 23 Oct 2008 10:27:34 +0000 Subject: [PATCH] =?utf8?q?FreeMarker=E3=81=AE=E3=83=86=E3=83=B3=E3=83=97?= =?utf8?q?=E3=83=AC=E3=83=BC=E3=83=88=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=9F?= =?utf8?q?=E7=94=9F=E6=88=90=E3=82=BF=E3=82=B9=E3=82=AF=E3=82=92=E4=BD=9C?= =?utf8?q?=E3=81=A3=E3=81=9F?= 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@52 136db618-7844-41ca-8ac1-fb3fd040db1d --- ea2ddl-ddl/build-ea2ddl.xml | 12 +- .../ddl/command/GenerateClassificationCommand.java | 81 ----------- .../ea2ddl/ddl/command/GenerateDdlCommand.java | 159 --------------------- .../ea2ddl/ddl/command/TemplateCommand.java | 37 ++++- .../ddl/task/GenerateClassificationTask.java | 22 --- .../ea2ddl/ddl/task/GenerateDdlTask.java | 35 ----- .../sourceforge/ea2ddl/ddl/task/TemplateTask.java | 7 +- .../src/main/resources/{base.ftl => ddl.ftl} | 0 .../src/main/resources/ea2ddl-taskdef.properties | 3 +- ea2ddl-ddl/src/main/resources/log4j.properties | 4 +- 10 files changed, 50 insertions(+), 310 deletions(-) delete mode 100644 ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateClassificationCommand.java delete mode 100644 ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateDdlCommand.java delete mode 100644 ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateClassificationTask.java delete mode 100644 ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateDdlTask.java rename ea2ddl-ddl/src/main/resources/{base.ftl => ddl.ftl} (100%) diff --git a/ea2ddl-ddl/build-ea2ddl.xml b/ea2ddl-ddl/build-ea2ddl.xml index 2626a11..123334c 100644 --- a/ea2ddl-ddl/build-ea2ddl.xml +++ b/ea2ddl-ddl/build-ea2ddl.xml @@ -18,19 +18,23 @@ - - - + - + diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateClassificationCommand.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateClassificationCommand.java deleted file mode 100644 index 5cf6a72..0000000 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateClassificationCommand.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * - */ -package jp.sourceforge.ea2ddl.ddl.command; - -import java.io.File; - -import jp.sourceforge.ea2ddl.ddl.model.Model; - -import org.seasar.extension.jdbc.gen.generator.GenerationContext; -import org.seasar.extension.jdbc.gen.generator.Generator; -import org.seasar.extension.jdbc.gen.internal.generator.GenerationContextImpl; -import org.seasar.extension.jdbc.gen.internal.generator.GeneratorImpl; -import org.seasar.framework.log.Logger; - -/** - * @author taktos - * - */ -public class GenerateClassificationCommand extends TemplateCommand { - private Logger _logger = Logger.getLogger(GenerateClassificationCommand.class); - - /* - * (非 Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doDestroy - * () - */ - @Override - protected void doDestroy() { - } - - /* - * (非 Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doInit() - */ - @Override - protected void doInit() { - } - - /* - * (非 Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doValidate - * () - */ - @Override - protected void doValidate() { - } - - /* - * (非 Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#getLogger - * () - */ - @Override - protected Logger getLogger() { - return _logger; - } - - @Override - protected GenerationContext createGenerationContext(Model model) { - final File output = new File(getOutputDirName(), getOutputFileName()); - final GenerationContextImpl generationContext = new GenerationContextImpl(model, output, - getTemplateFileName(), getOutputFileEncoding(), true); - return generationContext; - } - - @Override - protected Generator createGenerator() { - final File dir = new File(getTemplateFileDir()); - return new GeneratorImpl(getTemplateFileEncoding(), dir); - } - -} diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateDdlCommand.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateDdlCommand.java deleted file mode 100644 index 2e62214..0000000 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/GenerateDdlCommand.java +++ /dev/null @@ -1,159 +0,0 @@ -/** - * - */ -package jp.sourceforge.ea2ddl.ddl.command; - -import java.io.File; - -import jp.sourceforge.ea2ddl.ddl.factory.ModelFactory; -import jp.sourceforge.ea2ddl.ddl.model.Model; - -import org.seasar.extension.jdbc.gen.generator.GenerationContext; -import org.seasar.extension.jdbc.gen.generator.Generator; -import org.seasar.extension.jdbc.gen.internal.command.AbstractCommand; -import org.seasar.extension.jdbc.gen.internal.generator.GenerationContextImpl; -import org.seasar.extension.jdbc.gen.internal.generator.GeneratorImpl; -import org.seasar.framework.container.SingletonS2Container; -import org.seasar.framework.log.Logger; -import org.seasar.framework.util.ClassUtil; - -/** - * @author taktos - * - */ -public class GenerateDdlCommand extends AbstractCommand { - protected Logger _logger = Logger.getLogger(GenerateDdlCommand.class); - - protected String _factoryClassName; - protected String _templateFileDir = "target/classes"; - protected String _templateFileEncoding = "UTF-8"; - protected String _sqlFileEncoding = "UTF-8"; - protected String _outputDirName = "output"; - protected String _baseSqlFileName = "replace-schema-10-base.sql"; - protected String _baseSqlTemplateFileName = "base.ftl"; - - public String getFactoryClassName() { - return _factoryClassName; - } - - public void setFactoryClassName(String factoryClassName) { - _factoryClassName = factoryClassName; - } - - public String getTemplateFileDir() { - return _templateFileDir; - } - - public void setTemplateFileDir(String templateFileDir) { - _templateFileDir = templateFileDir; - } - - public String getTemplateFileEncoding() { - return _templateFileEncoding; - } - - public void setTemplateFileEncoding(String templateFileEncoding) { - _templateFileEncoding = templateFileEncoding; - } - - public String getSqlFileEncoding() { - return _sqlFileEncoding; - } - - public void setSqlFileEncoding(String sqlFileEncoding) { - _sqlFileEncoding = sqlFileEncoding; - } - - public String getOutputDirName() { - return _outputDirName; - } - - public void setOutputDirName(String outputDirName) { - _outputDirName = outputDirName; - } - - public String getBaseSqlFileName() { - return _baseSqlFileName; - } - - public void setBaseSqlFileName(String baseSqlFileName) { - _baseSqlFileName = baseSqlFileName; - } - - public String getBaseSqlTemplateFileName() { - return _baseSqlTemplateFileName; - } - - public void setBaseSqlTemplateFileName(String baseSqlTemplateFileName) { - _baseSqlTemplateFileName = baseSqlTemplateFileName; - } - - /* - * (�� Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doValidate - * () - */ - @Override - protected void doValidate() { - } - - /* - * (�� Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doInit() - */ - @Override - protected void doInit() { - } - - /* - * (�� Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doExecute - * () - */ - @Override - protected void doExecute() throws Throwable { - ModelFactory modelFactory = (ModelFactory) SingletonS2Container.getComponent(ClassUtil - .convertClass(_factoryClassName)); - final Model dbModel = modelFactory.create(); - generate(dbModel); - } - - protected void generate(Model model) { - final File templateDir = new File(_templateFileDir); - final Generator generator = new GeneratorImpl(_templateFileEncoding, templateDir); - File output = new File(_outputDirName, _baseSqlFileName); - final GenerationContext context = new GenerationContextImpl(model, output, _baseSqlTemplateFileName, - _sqlFileEncoding, true); - generator.generate(context); - } - - /* - * (�� Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#doDestroy - * () - */ - @Override - protected void doDestroy() { - } - - /* - * (�� Javadoc) - * - * @see - * org.seasar.extension.jdbc.gen.internal.command.AbstractCommand#getLogger - * () - */ - @Override - protected Logger getLogger() { - return _logger; - } - -} diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/TemplateCommand.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/TemplateCommand.java index d81ff4c..2e6a2ff 100644 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/TemplateCommand.java +++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/command/TemplateCommand.java @@ -3,20 +3,26 @@ */ package jp.sourceforge.ea2ddl.ddl.command; +import java.io.File; + import jp.sourceforge.ea2ddl.ddl.factory.ModelFactory; import jp.sourceforge.ea2ddl.ddl.model.Model; import org.seasar.extension.jdbc.gen.generator.GenerationContext; import org.seasar.extension.jdbc.gen.generator.Generator; import org.seasar.extension.jdbc.gen.internal.command.AbstractCommand; +import org.seasar.extension.jdbc.gen.internal.generator.GenerationContextImpl; +import org.seasar.extension.jdbc.gen.internal.generator.GeneratorImpl; import org.seasar.framework.container.SingletonS2Container; +import org.seasar.framework.log.Logger; import org.seasar.framework.util.ClassUtil; /** * @author taktos * */ -public abstract class TemplateCommand extends AbstractCommand { +public class TemplateCommand extends AbstractCommand { + private Logger _logger = Logger.getLogger(TemplateCommand.class); protected String _factoryClassName; protected String _templateFileDir = "target/classes"; @@ -83,6 +89,14 @@ public abstract class TemplateCommand extends AbstractCommand { } @Override + protected void doInit() { + } + + @Override + protected void doValidate() { + } + + @Override protected void doExecute() throws Throwable { final ModelFactory modelFactory = (ModelFactory) SingletonS2Container.getComponent(ClassUtil .convertClass(getFactoryClassName())); @@ -90,7 +104,24 @@ public abstract class TemplateCommand extends AbstractCommand { createGenerator().generate(createGenerationContext(model)); } - protected abstract Generator createGenerator(); + @Override + protected void doDestroy() { + } + + @Override + protected Logger getLogger() { + return _logger; + } - protected abstract GenerationContext createGenerationContext(Model model); + protected Generator createGenerator() { + final File dir = new File(getTemplateFileDir()); + return new GeneratorImpl(getTemplateFileEncoding(), dir); + } + + protected GenerationContext createGenerationContext(Model model) { + final File output = new File(getOutputDirName(), getOutputFileName()); + final GenerationContextImpl generationContext = new GenerationContextImpl(model, output, getTemplateFileName(), + getOutputFileEncoding(), true); + return generationContext; + } } diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateClassificationTask.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateClassificationTask.java deleted file mode 100644 index ac4b4c8..0000000 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateClassificationTask.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - */ -package jp.sourceforge.ea2ddl.ddl.task; - -import jp.sourceforge.ea2ddl.ddl.command.GenerateClassificationCommand; -import jp.sourceforge.ea2ddl.ddl.command.TemplateCommand; - -/** - * @author taktos - * - */ -public class GenerateClassificationTask extends TemplateTask { - - protected GenerateClassificationCommand _command = new GenerateClassificationCommand(); - - @Override - protected TemplateCommand getTemplateCommand() { - return _command; - } - -} diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateDdlTask.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateDdlTask.java deleted file mode 100644 index 626ed45..0000000 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/GenerateDdlTask.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * - */ -package jp.sourceforge.ea2ddl.ddl.task; - -import jp.sourceforge.ea2ddl.ddl.command.GenerateDdlCommand; - -import org.seasar.extension.jdbc.gen.command.Command; -import org.seasar.extension.jdbc.gen.task.AbstractTask; - -/** - * @author taktos - * - */ -public class GenerateDdlTask extends AbstractTask { - protected GenerateDdlCommand _command = new GenerateDdlCommand(); - - /* - * (”ñ Javadoc) - * - * @see org.seasar.extension.jdbc.gen.task.AbstractTask#getCommand() - */ - @Override - protected Command getCommand() { - return _command; - } - - public void setConfigPath(String configPath) { - _command.setConfigPath(configPath); - } - - public void setFactoryClassName(String className) { - _command.setFactoryClassName(className); - } -} diff --git a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/TemplateTask.java b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/TemplateTask.java index b6e91b8..b9d653f 100644 --- a/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/TemplateTask.java +++ b/ea2ddl-ddl/src/main/java/jp/sourceforge/ea2ddl/ddl/task/TemplateTask.java @@ -12,9 +12,12 @@ import org.seasar.extension.jdbc.gen.task.AbstractTask; * @author taktos * */ -public abstract class TemplateTask extends AbstractTask { +public class TemplateTask extends AbstractTask { + private TemplateCommand _command = new TemplateCommand(); - protected abstract TemplateCommand getTemplateCommand(); + protected TemplateCommand getTemplateCommand() { + return _command; + } @Override protected Command getCommand() { diff --git a/ea2ddl-ddl/src/main/resources/base.ftl b/ea2ddl-ddl/src/main/resources/ddl.ftl similarity index 100% rename from ea2ddl-ddl/src/main/resources/base.ftl rename to ea2ddl-ddl/src/main/resources/ddl.ftl diff --git a/ea2ddl-ddl/src/main/resources/ea2ddl-taskdef.properties b/ea2ddl-ddl/src/main/resources/ea2ddl-taskdef.properties index 3be2361..5d633eb 100644 --- a/ea2ddl-ddl/src/main/resources/ea2ddl-taskdef.properties +++ b/ea2ddl-ddl/src/main/resources/ea2ddl-taskdef.properties @@ -1,2 +1 @@ -gen-ddl=jp.sourceforge.ea2ddl.ddl.task.GenerateDdlTask -gen-classification=jp.sourceforge.ea2ddl.ddl.task.GenerateClassificationTask \ No newline at end of file +gen-merge=jp.sourceforge.ea2ddl.ddl.task.TemplateTask \ No newline at end of file diff --git a/ea2ddl-ddl/src/main/resources/log4j.properties b/ea2ddl-ddl/src/main/resources/log4j.properties index 80480de..ac83275 100644 --- a/ea2ddl-ddl/src/main/resources/log4j.properties +++ b/ea2ddl-ddl/src/main/resources/log4j.properties @@ -1,7 +1,7 @@ -log4j.rootLogger=DEBUG,STDOUT +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 +log4j.category.org.seasar=INFO -- 2.11.0