[Jiemamy-notify] commit [2248] パッケージ統一（org .jiemamy.extension. dialect → org .jiemamy. dialect）

svnno****@sourc***** svnno****@sourc*****
2008年 12月 12日 (金) 01:23:20 JST

• 前の記事 [Jiemamy-notify] commit [2247] 色々ミス修正。
• 次の記事 [Jiemamy-notify] commit [2249] パッケージ統一（org .jiemamy.extension. dialect → org .jiemamy. dialect）
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 2248
          http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2248
Author:   daisuke_m
Date:     2008-12-12 01:23:19 +0900 (Fri, 12 Dec 2008)

Log Message:
-----------
パッケージ統一（org.jiemamy.extension.dialect → org.jiemamy.dialect）

Modified Paths:
--------------
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/ExportContextImpl.java
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
    artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java
    artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
    artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
    artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/AbstractIdentifierValidator.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/DefaultIdentifierValidator.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/AbstractContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/DatabaseReader.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideForeignKeyNameProcessor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModelImpl.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/AbstractEntityModelImpl.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/AbstractIdentifierValidatorTest.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/DefaultIdentifierValidatorTest.java
    artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
    artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
    artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
    artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
    artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java
    artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java
    artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/ModelInputStreamTest.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectInstanceAccessStrategy.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterInstanceAccessStrategy.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterInstanceAccessStrategy.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
    vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
    zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExportContext.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Exporter.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExporterProvider.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImportContext.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Importer.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImporterProvider.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/IdentifierValidator.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/MappingInfo.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Quoter.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/DataTypeNotFoundException.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ExportException.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDataTypeResolverException.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ImportException.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/Jiemamy.java

Added Paths:
-----------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DatabaseReadingContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/GenericDataTypeResolver.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/ReflectionDialectAccessStrategy.java
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/Context.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/InstanceAccessStrategy.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java

Removed Paths:
-------------
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DatabaseReadingContext.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DefaultConnectionAdvisor.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/GenericDataTypeResolver.java
    artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/validator/
    artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/extension/
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general/
    artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DialectProvider.java
    zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/


-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/ExportContextImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/ExportContextImpl.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/ExportContextImpl.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.composer.exporter;
 
-import org.jiemamy.extension.composer.ExportContext;
+import org.jiemamy.composer.ExportContext;
 import org.jiemamy.internal.interpreter.AbstractContext;
 
 /**

Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/HtmlExporter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -19,9 +19,9 @@
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.Validate;
 
+import org.jiemamy.composer.ExportContext;
+import org.jiemamy.composer.Exporter;
 import org.jiemamy.exception.ExportException;
-import org.jiemamy.extension.composer.ExportContext;
-import org.jiemamy.extension.composer.Exporter;
 import org.jiemamy.model.RootModel;
 
 /**

Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/exporter/SqlExporter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -29,10 +29,10 @@
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.Validate;
 
+import org.jiemamy.composer.ExportContext;
+import org.jiemamy.composer.Exporter;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.exception.ExportException;
-import org.jiemamy.extension.composer.ExportContext;
-import org.jiemamy.extension.composer.Exporter;
-import org.jiemamy.extension.dialect.Dialect;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.model.sql.SqlStatement;

Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/DatabaseImporter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -15,14 +15,14 @@
 import org.seasar.framework.beans.util.BeanUtil;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.dialect.general.GeneralDialect;
+import org.jiemamy.composer.ImportContext;
+import org.jiemamy.composer.Importer;
+import org.jiemamy.dialect.DatabaseReadingContext;
+import org.jiemamy.dialect.Dialect;
+import org.jiemamy.dialect.generic.GeneralDialect;
 import org.jiemamy.exception.GenericModelingModeException;
 import org.jiemamy.exception.ImportException;
 import org.jiemamy.exception.TooManyElementsException;
-import org.jiemamy.extension.composer.ImportContext;
-import org.jiemamy.extension.composer.Importer;
-import org.jiemamy.extension.dialect.DatabaseReadingContext;
-import org.jiemamy.extension.dialect.Dialect;
 import org.jiemamy.internal.interpreter.DatabaseReader;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.model.connection.ForeignKeyMapping;

Modified: artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/main/java/org/jiemamy/composer/importer/ImportContextImpl.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.composer.importer;
 
-import org.jiemamy.extension.composer.ImportContext;
+import org.jiemamy.composer.ImportContext;
 import org.jiemamy.internal.interpreter.AbstractContext;
 
 /**

Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/exporter/SqlExporterTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -35,9 +35,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.jiemamy.extension.ReflectionDialectAccessStrategy;
-import org.jiemamy.extension.composer.ExportContext;
-import org.jiemamy.extension.composer.Exporter;
+import org.jiemamy.ReflectionDialectAccessStrategy;
+import org.jiemamy.composer.ExportContext;
+import org.jiemamy.composer.Exporter;
 import org.jiemamy.model.Artemis;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;

Modified: artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java
===================================================================
--- artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.composer/src/test/java/org/jiemamy/composer/importer/DatabaseImporterTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -30,10 +30,10 @@
 import org.junit.runner.RunWith;
 import org.seasar.framework.unit.Seasar2;
 
-import org.jiemamy.extension.ReflectionDialectAccessStrategy;
-import org.jiemamy.extension.composer.ImportContext;
-import org.jiemamy.extension.composer.Importer;
-import org.jiemamy.extension.dialect.Dialect;
+import org.jiemamy.ReflectionDialectAccessStrategy;
+import org.jiemamy.composer.ImportContext;
+import org.jiemamy.composer.Importer;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.model.Artemis;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;

Modified: artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/META-INF/MANIFEST.MF	2008-12-11 16:23:19 UTC (rev 2248)
@@ -165,9 +165,8 @@
  org.easymock,
  org.easymock.internal,
  org.easymock.internal.matchers,
- org.jiemamy.extension,
- org.jiemamy.extension.dialect,
- org.jiemamy.extension.dialect.validator,
+ org.jiemamy.dialect,
+ org.jiemamy.dialect.validator,
  org.jiemamy.internal,
  org.jiemamy.internal.accessor,
  org.jiemamy.internal.accessor.connection,

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DatabaseReadingContext.java (from rev 2243, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DatabaseReadingContext.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DatabaseReadingContext.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DatabaseReadingContext.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/04
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect;
+
+import org.jiemamy.internal.interpreter.AbstractContext;
+
+/**
+ * データベースからモデルにインポートを行う際のコンテキスト情報。
+ * @author daisuke
+ */
+public class DatabaseReadingContext extends AbstractContext {
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DatabaseReadingContext.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java (from rev 2243, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DefaultConnectionAdvisor.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect;
+
+import java.sql.Connection;
+
+import org.jiemamy.dialect.ConnectionAdvisor;
+
+/**
+ * {@link ConnectionAdvisor}のデフォルト実装。
+ * @author daisuke
+ */
+public class DefaultConnectionAdvisor implements ConnectionAdvisor {
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void setUpRead(Connection connection) {
+		// nothing to do
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void tearDownRead(Connection connection) {
+		// nothing to do
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/DefaultConnectionAdvisor.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/GenericDataTypeResolver.java (from rev 2243, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/GenericDataTypeResolver.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/GenericDataTypeResolver.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/GenericDataTypeResolver.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/08/29
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect;
+
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.seasar.framework.util.tiger.CollectionsUtil;
+
+import org.jiemamy.dialect.DataTypeResolver;
+import org.jiemamy.dialect.Dialect;
+import org.jiemamy.dialect.MappingInfo;
+import org.jiemamy.exception.DataTypeNotFoundException;
+import org.jiemamy.exception.IllegalDataTypeImplementationException;
+import org.jiemamy.exception.IllegalDialectImplementationException;
+import org.jiemamy.exception.UnexpectedConditionError;
+import org.jiemamy.model.datatype.DataType;
+import org.jiemamy.model.datatype.DataTypeDescriptor;
+import org.jiemamy.utils.JmStringUtil;
+
+/**
+ * SQL方言において、{@link DataTypeDescriptor}と{@link DataType}間の解決を行うクラス。
+ * @author daisuke
+ */
+public class GenericDataTypeResolver implements DataTypeResolver {
+	
+	private List<Class<? extends DataType>> allModelingDataTypes = CollectionsUtil.newArrayList();
+	
+	private final Dialect dialect;
+	
+
+	/**
+	 * コンストラクタ。
+	 * @param dialect 
+	 * @category instance creation
+	 */
+	public GenericDataTypeResolver(Dialect dialect) {
+		this.dialect = dialect;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<Class<? extends DataType>> getAllModelingDataTypes() {
+		assert allModelingDataTypes != null;
+		return allModelingDataTypes;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public void register(Class<? extends DataType> clazz) {
+		assert allModelingDataTypes != null;
+		Validate.notNull(clazz);
+		allModelingDataTypes.add(clazz);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public DataType resolveDataType(DataTypeDescriptor dataTypeDescriptor) {
+		assert allModelingDataTypes != null;
+		Validate.notNull(dataTypeDescriptor);
+		for (Class<? extends DataType> clazz : allModelingDataTypes) {
+			if (clazz.getAnnotation(MappingInfo.class).descriptor() == dataTypeDescriptor.getClass()) {
+				try {
+					return clazz.newInstance();
+				} catch (InstantiationException e) {
+					throw new IllegalDataTypeImplementationException(clazz, e);
+				} catch (IllegalAccessException e) {
+					throw new IllegalDataTypeImplementationException(clazz, e);
+				}
+			}
+		}
+		throw new IllegalDialectImplementationException("no suitable DataType: " + dataTypeDescriptor);
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public DataTypeDescriptor resolveDataTypeDescriptor(String typeName) throws DataTypeNotFoundException {
+		assert allModelingDataTypes != null;
+		for (Class<? extends DataType> clazz : allModelingDataTypes) {
+			MappingInfo annotation = clazz.getAnnotation(MappingInfo.class);
+			if (annotation.typeName().equalsIgnoreCase(typeName)
+					|| JmStringUtil.containsIgnoreCase(annotation.alias(), typeName)) {
+				try {
+					return annotation.descriptor().newInstance();
+				} catch (InstantiationException e) {
+					throw new UnexpectedConditionError(
+							"Illegal DataTypeDescriptor implementation (need default constructor): " + clazz, e);
+				} catch (IllegalAccessException e) {
+					throw new UnexpectedConditionError(
+							"Illegal DataTypeDescriptor implementation (need public constructor): " + clazz, e);
+				}
+			}
+		}
+		throw new DataTypeNotFoundException(dialect, typeName);
+	}
+	
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/GenericDataTypeResolver.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator (from rev 2243, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/validator)

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/AbstractIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/validator/AbstractIdentifierValidator.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/AbstractIdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,14 +16,14 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect.validator;
+package org.jiemamy.dialect.validator;
 
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.Validate;
 
-import org.jiemamy.extension.dialect.IdentifierValidator;
+import org.jiemamy.dialect.IdentifierValidator;
 
 /**
  * {@link IdentifierValidator}の抽象実装。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/DefaultIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/validator/DefaultIdentifierValidator.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/DefaultIdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect.validator;
+package org.jiemamy.dialect.validator;
 
-import org.jiemamy.extension.dialect.IdentifierValidator;
+import org.jiemamy.dialect.IdentifierValidator;
 
 /**
  * {@link IdentifierValidator}のデフォルト実装。全て通す。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/validator/ReservedWordsProvider.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/dialect/validator/ReservedWordsProvider.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect.validator;
+package org.jiemamy.dialect.validator;
 
 /**
  * 予約語プロバイダ。

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DatabaseReadingContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DatabaseReadingContext.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DatabaseReadingContext.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,29 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/04
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.extension.dialect;
-
-import org.jiemamy.internal.interpreter.AbstractContext;
-
-/**
- * データベースからモデルにインポートを行う際のコンテキスト情報。
- * @author daisuke
- */
-public class DatabaseReadingContext extends AbstractContext {
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DefaultConnectionAdvisor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DefaultConnectionAdvisor.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/DefaultConnectionAdvisor.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,43 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/09/10
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.extension.dialect;
-
-import java.sql.Connection;
-
-/**
- * {@link ConnectionAdvisor}のデフォルト実装。
- * @author daisuke
- */
-public class DefaultConnectionAdvisor implements ConnectionAdvisor {
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setUpRead(Connection connection) {
-		// nothing to do
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void tearDownRead(Connection connection) {
-		// nothing to do
-	}
-	
-}

Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/GenericDataTypeResolver.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/GenericDataTypeResolver.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/extension/dialect/GenericDataTypeResolver.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,114 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/08/29
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.extension.dialect;
-
-import java.util.List;
-
-import org.apache.commons.lang.Validate;
-import org.seasar.framework.util.tiger.CollectionsUtil;
-
-import org.jiemamy.exception.DataTypeNotFoundException;
-import org.jiemamy.exception.IllegalDataTypeImplementationException;
-import org.jiemamy.exception.IllegalDialectImplementationException;
-import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.model.datatype.DataType;
-import org.jiemamy.model.datatype.DataTypeDescriptor;
-import org.jiemamy.utils.JmStringUtil;
-
-/**
- * SQL方言において、{@link DataTypeDescriptor}と{@link DataType}間の解決を行うクラス。
- * @author daisuke
- */
-public class GenericDataTypeResolver implements DataTypeResolver {
-	
-	private List<Class<? extends DataType>> allModelingDataTypes = CollectionsUtil.newArrayList();
-	
-	private final Dialect dialect;
-	
-
-	/**
-	 * コンストラクタ。
-	 * @param dialect 
-	 * @category instance creation
-	 */
-	public GenericDataTypeResolver(Dialect dialect) {
-		this.dialect = dialect;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public List<Class<? extends DataType>> getAllModelingDataTypes() {
-		assert allModelingDataTypes != null;
-		return allModelingDataTypes;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public void register(Class<? extends DataType> clazz) {
-		assert allModelingDataTypes != null;
-		Validate.notNull(clazz);
-		allModelingDataTypes.add(clazz);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public DataType resolveDataType(DataTypeDescriptor dataTypeDescriptor) {
-		assert allModelingDataTypes != null;
-		Validate.notNull(dataTypeDescriptor);
-		for (Class<? extends DataType> clazz : allModelingDataTypes) {
-			if (clazz.getAnnotation(MappingInfo.class).descriptor() == dataTypeDescriptor.getClass()) {
-				try {
-					return clazz.newInstance();
-				} catch (InstantiationException e) {
-					throw new IllegalDataTypeImplementationException(clazz, e);
-				} catch (IllegalAccessException e) {
-					throw new IllegalDataTypeImplementationException(clazz, e);
-				}
-			}
-		}
-		throw new IllegalDialectImplementationException("no suitable DataType: " + dataTypeDescriptor);
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public DataTypeDescriptor resolveDataTypeDescriptor(String typeName) throws DataTypeNotFoundException {
-		assert allModelingDataTypes != null;
-		for (Class<? extends DataType> clazz : allModelingDataTypes) {
-			MappingInfo annotation = clazz.getAnnotation(MappingInfo.class);
-			if (annotation.typeName().equalsIgnoreCase(typeName)
-					|| JmStringUtil.containsIgnoreCase(annotation.alias(), typeName)) {
-				try {
-					return annotation.descriptor().newInstance();
-				} catch (InstantiationException e) {
-					throw new UnexpectedConditionError(
-							"Illegal DataTypeDescriptor implementation (need default constructor): " + clazz, e);
-				} catch (IllegalAccessException e) {
-					throw new UnexpectedConditionError(
-							"Illegal DataTypeDescriptor implementation (need public constructor): " + clazz, e);
-				}
-			}
-		}
-		throw new DataTypeNotFoundException(dialect, typeName);
-	}
-	
-}

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/AbstractContext.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/AbstractContext.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/AbstractContext.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -22,7 +22,7 @@
 
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.extension.Context;
+import org.jiemamy.Context;
 
 /**
  * コンテキスト情報。

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/DatabaseReader.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/DatabaseReader.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/interpreter/DatabaseReader.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -27,8 +27,8 @@
 import org.apache.commons.lang.Validate;
 import org.seasar.framework.util.tiger.CollectionsUtil;
 
-import org.jiemamy.extension.dialect.DatabaseReadingContext;
-import org.jiemamy.extension.dialect.Dialect;
+import org.jiemamy.dialect.DatabaseReadingContext;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.utils.ForEachUtil;
 import org.jiemamy.utils.visitor.AbstractResultSetVisitor;
 import org.jiemamy.utils.visitor.impl.EntityNamesVisitor;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideEntityNameProcessor.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -20,10 +20,10 @@
 
 import org.apache.commons.lang.Validate;
 
+import org.jiemamy.dialect.IdentifierValidator;
 import org.jiemamy.exception.ElementNotFoundException;
 import org.jiemamy.exception.TooManyElementsException;
 import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.extension.dialect.IdentifierValidator;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.model.node.AbstractEntityModel;
 import org.jiemamy.model.node.TableModel;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideForeignKeyNameProcessor.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideForeignKeyNameProcessor.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/internal/processor/ProvideForeignKeyNameProcessor.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -22,8 +22,8 @@
 
 import org.apache.commons.lang.Validate;
 
+import org.jiemamy.dialect.IdentifierValidator;
 import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.extension.dialect.IdentifierValidator;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.model.connection.ForeignKeyModel;
 import org.jiemamy.model.node.TableModel;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModelImpl.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/connection/ForeignKeyModelImpl.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -24,7 +24,7 @@
 import org.apache.commons.lang.Validate;
 import org.seasar.framework.container.annotation.tiger.Binding;
 
-import org.jiemamy.extension.dialect.validator.DefaultIdentifierValidator;
+import org.jiemamy.dialect.validator.DefaultIdentifierValidator;
 import org.jiemamy.internal.accessor.connection.ForeignKeyModelAccessor;
 import org.jiemamy.internal.processor.GetMappingProcessor;
 import org.jiemamy.internal.processor.ProvideForeignKeyNameProcessor;

Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/AbstractEntityModelImpl.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/AbstractEntityModelImpl.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/model/node/AbstractEntityModelImpl.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -23,7 +23,7 @@
 
 import org.apache.commons.lang.Validate;
 
-import org.jiemamy.extension.dialect.validator.DefaultIdentifierValidator;
+import org.jiemamy.dialect.validator.DefaultIdentifierValidator;
 import org.jiemamy.internal.accessor.node.EntityModelAccessor;
 import org.jiemamy.internal.processor.GetConstrainEntitiesProcessor;
 import org.jiemamy.internal.processor.GetReferenceEntitiesProcessor;

Copied: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/ReflectionDialectAccessStrategy.java (from rev 2247, artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/extension/ReflectionDialectAccessStrategy.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/ReflectionDialectAccessStrategy.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/ReflectionDialectAccessStrategy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/12/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.jiemamy.dialect.Dialect;
+import org.jiemamy.exception.UnexpectedConditionError;
+import org.jiemamy.model.Jiemamy;
+
+/**
+ * 相対パスから強引にDialectを取得するための、テスト用インスタンス取得戦略クラス。
+ * @author daisuke
+ */
+public class ReflectionDialectAccessStrategy extends Jiemamy.DefaultInstanceAccessStrategy<Dialect> {
+	
+	/**
+	 * コンストラクタ。
+	 * @category instance creation
+	 */
+	public ReflectionDialectAccessStrategy() {
+		try {
+			classLoader = new URLClassLoader(new URL[] {
+				new File("../org.jiemamy.dialect/target/classes").toURL(),
+				new File("../org.jiemamy.dialect.mysql/target/classes").toURL(),
+				new File("../org.jiemamy.dialect.postgresql/target/classes").toURL(),
+				new File("../org.jiemamy.dialect.sql99/target/classes").toURL()
+			});
+		} catch (MalformedURLException e) {
+			throw new UnexpectedConditionError("spell miss?", e);
+		}
+	}
+}


Property changes on: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/ReflectionDialectAccessStrategy.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator (from rev 2243, artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/extension/dialect/validator)

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/AbstractIdentifierValidatorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/extension/dialect/validator/AbstractIdentifierValidatorTest.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/AbstractIdentifierValidatorTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect.validator;
+package org.jiemamy.dialect.validator;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -25,9 +25,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.extension.dialect.IdentifierValidator;
-import org.jiemamy.extension.dialect.validator.AbstractIdentifierValidator;
-import org.jiemamy.extension.dialect.validator.ReservedWordsProvider;
+import org.jiemamy.dialect.IdentifierValidator;
+import org.jiemamy.dialect.validator.AbstractIdentifierValidator;
+import org.jiemamy.dialect.validator.ReservedWordsProvider;
 
 /**
  * {@link AbstractIdentifierValidator}のテストクラス。

Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/DefaultIdentifierValidatorTest.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/extension/dialect/validator/DefaultIdentifierValidatorTest.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/dialect/validator/DefaultIdentifierValidatorTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect.validator;
+package org.jiemamy.dialect.validator;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -26,8 +26,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.extension.dialect.IdentifierValidator;
-import org.jiemamy.extension.dialect.validator.DefaultIdentifierValidator;
+import org.jiemamy.dialect.IdentifierValidator;
+import org.jiemamy.dialect.validator.DefaultIdentifierValidator;
 
 /**
  * {@link DefaultIdentifierValidator}のテストクラス。

Modified: artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF
===================================================================
--- artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect/META-INF/MANIFEST.MF	2008-12-11 16:23:19 UTC (rev 2248)
@@ -19,7 +19,6 @@
 Eclipse-RegisterBuddy:  org.jiemamy.spec.core,
  org.jiemamy.core
 Export-Package: org.jiemamy.dialect,
- org.jiemamy.dialect.general,
  org.jiemamy.dialect.generic,
  org.jiemamy.dialect.helper,
  org.jiemamy.dialect.test

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -28,16 +28,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.jiemamy.dialect.DefaultConnectionAdvisor;
+import org.jiemamy.dialect.GenericDataTypeResolver;
+import org.jiemamy.dialect.validator.DefaultIdentifierValidator;
 import org.jiemamy.exception.DataTypeNotFoundException;
 import org.jiemamy.exception.IllegalDataTypeResolverException;
-import org.jiemamy.extension.dialect.ConnectionAdvisor;
-import org.jiemamy.extension.dialect.DataTypeResolver;
-import org.jiemamy.extension.dialect.DefaultConnectionAdvisor;
-import org.jiemamy.extension.dialect.Dialect;
-import org.jiemamy.extension.dialect.GenericDataTypeResolver;
-import org.jiemamy.extension.dialect.IdentifierValidator;
-import org.jiemamy.extension.dialect.Quoter;
-import org.jiemamy.extension.dialect.validator.DefaultIdentifierValidator;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;
 import org.jiemamy.model.attribute.ColumnModel;

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/DefaultQuoter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect;
 
-import org.jiemamy.extension.dialect.Quoter;
+import org.jiemamy.dialect.Quoter;
 
 /**
  * {@link Quoter}のデフォルト実装。

Copied: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic (from rev 2243, artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general)

Deleted: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general/GeneralDialect.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,121 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/07
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.dialect.general;
-
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.util.List;
-
-import org.jiemamy.extension.dialect.ConnectionAdvisor;
-import org.jiemamy.extension.dialect.DataTypeResolver;
-import org.jiemamy.extension.dialect.DefaultConnectionAdvisor;
-import org.jiemamy.extension.dialect.Dialect;
-import org.jiemamy.extension.dialect.GenericDataTypeResolver;
-import org.jiemamy.extension.dialect.IdentifierValidator;
-import org.jiemamy.extension.dialect.Quoter;
-import org.jiemamy.model.InstanceCreationStrategy;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.AbstractEntityModel;
-import org.jiemamy.model.sql.SqlStatement;
-
-/**
- * 全てのSQL方言に対応し得る、最大公約数的なSQL方言実装クラス。
- * @author  daisuke
- */
-public class GeneralDialect implements Dialect {
-	
-	private Quoter quoter = new Quoter() {
-		
-		public String quote(String input, QuoteKind kind) {
-			if (kind == QuoteKind.DATA) {
-				return "'" + input + "'";
-			}
-			return input;
-		}
-		
-	};
-	
-	private DataTypeResolver dataTypeResolver = new GenericDataTypeResolver(this);
-	
-	private IdentifierValidator validator = new GenericValidator();
-	
-	private ConnectionAdvisor advisor = new DefaultConnectionAdvisor();
-	
-
-	/**
-	 * コンストラクタ。
-	 * @category  instance creation
-	 */
-	public GeneralDialect() {
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public ConnectionAdvisor getAdvisor() {
-		assert advisor != null;
-		return advisor;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public DataTypeResolver getDataTypeResolver() {
-		assert dataTypeResolver != null;
-		return dataTypeResolver;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public Quoter getQuoter() {
-		assert quoter != null;
-		return quoter;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public IdentifierValidator getValidator() {
-		assert validator != null;
-		return validator;
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public RootModel toRootModel(List<SqlStatement> statements, InstanceCreationStrategy strategy) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * {@inheritDoc}
-	 */
-	public List<SqlStatement> toStatements(RootModel rootModel) {
-		throw new UnsupportedOperationException();
-	}
-	
-}

Copied: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java (from rev 2244, artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general/GeneralDialect.java)
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	                        (rev 0)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GeneralDialect.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/07
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect.generic;
+
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.util.List;
+
+import org.jiemamy.dialect.ConnectionAdvisor;
+import org.jiemamy.dialect.DataTypeResolver;
+import org.jiemamy.dialect.DefaultConnectionAdvisor;
+import org.jiemamy.dialect.Dialect;
+import org.jiemamy.dialect.GenericDataTypeResolver;
+import org.jiemamy.dialect.IdentifierValidator;
+import org.jiemamy.dialect.Quoter;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.node.AbstractEntityModel;
+import org.jiemamy.model.sql.SqlStatement;
+
+/**
+ * 全てのSQL方言に対応し得る、最大公約数的なSQL方言実装クラス。
+ * @author  daisuke
+ */
+public class GeneralDialect implements Dialect {
+	
+	private Quoter quoter = new Quoter() {
+		
+		public String quote(String input, QuoteKind kind) {
+			if (kind == QuoteKind.DATA) {
+				return "'" + input + "'";
+			}
+			return input;
+		}
+		
+	};
+	
+	private DataTypeResolver dataTypeResolver = new GenericDataTypeResolver(this);
+	
+	private IdentifierValidator validator = new GenericValidator();
+	
+	private ConnectionAdvisor advisor = new DefaultConnectionAdvisor();
+	
+
+	/**
+	 * コンストラクタ。
+	 * @category  instance creation
+	 */
+	public GeneralDialect() {
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) {
+		throw new UnsupportedOperationException();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public ConnectionAdvisor getAdvisor() {
+		assert advisor != null;
+		return advisor;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public DataTypeResolver getDataTypeResolver() {
+		assert dataTypeResolver != null;
+		return dataTypeResolver;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public Quoter getQuoter() {
+		assert quoter != null;
+		return quoter;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public IdentifierValidator getValidator() {
+		assert validator != null;
+		return validator;
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public RootModel toRootModel(List<SqlStatement> statements) {
+		throw new UnsupportedOperationException();
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<SqlStatement> toStatements(RootModel rootModel) {
+		throw new UnsupportedOperationException();
+	}
+	
+}

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general/GenericReservedWords.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericReservedWords.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.dialect.general;
+package org.jiemamy.dialect.generic;
 
-import org.jiemamy.extension.dialect.validator.ReservedWordsProvider;
+import org.jiemamy.dialect.validator.ReservedWordsProvider;
 
 /**
  * 一般SQL方言における予約語を提供するクラス。

Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/general/GenericValidator.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/generic/GenericValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.dialect.general;
+package org.jiemamy.dialect.generic;
 
-import org.jiemamy.extension.dialect.validator.AbstractIdentifierValidator;
+import org.jiemamy.dialect.validator.AbstractIdentifierValidator;
 
 /**
  * 一般Dialectに対する識別子バリデータ。

Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -28,7 +28,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.jiemamy.dialect.general.GeneralDialect;
+import org.jiemamy.dialect.generic.GeneralDialect;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.DataTypeDescriptor;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlIdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.mysql;
 
-import org.jiemamy.extension.dialect.validator.AbstractIdentifierValidator;
+import org.jiemamy.dialect.validator.AbstractIdentifierValidator;
 
 /**
  * MySQL用識別子バリデータ。

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/MySqlReservedWords.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.mysql;
 
-import org.jiemamy.extension.dialect.validator.ReservedWordsProvider;
+import org.jiemamy.dialect.validator.ReservedWordsProvider;
 
 /**
  * MySQLの予約語を提供するクラス。

Modified: artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.mysql/src/main/java/org/jiemamy/dialect/mysql/datatype/IntegerDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.mysql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlIdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.extension.dialect.validator.AbstractIdentifierValidator;
+import org.jiemamy.dialect.validator.AbstractIdentifierValidator;
 
 /**
  * PostgreSQL用識別子バリデータ。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlQuoter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.extension.dialect.Quoter;
+import org.jiemamy.dialect.Quoter;
 
 /**
  * PostgreSQL用 {@link Quoter}実装。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/PostgresqlReservedWords.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql;
 
-import org.jiemamy.extension.dialect.validator.ReservedWordsProvider;
+import org.jiemamy.dialect.validator.ReservedWordsProvider;
 
 /**
  * PostgreSQLの予約語を提供するクラス。

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigIntegerDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.BigIntegerDataTypeDescriptor;
 import org.jiemamy.model.datatype.DataType;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BigSerialDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.BigIntegerDataTypeDescriptor;
 import org.jiemamy.model.datatype.DataType;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BlobDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.BlobDataTypeDescriptor;
 import org.jiemamy.model.datatype.DataType;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BooleanDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.CharacterDataTypeDescriptor;
 import org.jiemamy.model.datatype.DataType;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DateDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.TimestampDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.NumericDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DoubleDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.RealDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/FloatDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.RealDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntegerDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/IntervalDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/MoneyDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.NumericDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/RealDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.RealDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SerialDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/SmallIntegerDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TextDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.ClobDataTypeDescriptor;
 import org.jiemamy.model.datatype.DataType;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.TimestampDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.TimestampDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.IntegerDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.postgresql.datatype;
 
-import org.jiemamy.extension.dialect.MappingInfo;
+import org.jiemamy.dialect.MappingInfo;
 import org.jiemamy.model.datatype.AbstractDataType;
 import org.jiemamy.model.datatype.DataType;
 import org.jiemamy.model.datatype.VarcharDataTypeDescriptor;

Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -51,13 +51,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.jiemamy.ReflectionDialectAccessStrategy;
+import org.jiemamy.dialect.DataTypeResolver;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.dialect.helper.JiemamyXADataSource;
 import org.jiemamy.dialect.postgresql.datatype.IntegerDataType;
 import org.jiemamy.dialect.postgresql.datatype.VarcharDataType;
 import org.jiemamy.exception.DataTypeNotFoundException;
-import org.jiemamy.extension.ReflectionDialectAccessStrategy;
-import org.jiemamy.extension.dialect.DataTypeResolver;
-import org.jiemamy.extension.dialect.Dialect;
 import org.jiemamy.model.Artemis;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99IdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.sql99;
 
-import org.jiemamy.extension.dialect.validator.AbstractIdentifierValidator;
+import org.jiemamy.dialect.validator.AbstractIdentifierValidator;
 
 /**
  * 標準SQL99用 識別子バリデータ。

Modified: artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.dialect.sql99/src/main/java/org/jiemamy/dialect/sql99/Sql99ReservedWords.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.dialect.sql99;
 
-import org.jiemamy.extension.dialect.validator.ReservedWordsProvider;
+import org.jiemamy.dialect.validator.ReservedWordsProvider;
 
 /**
  * SQL99の予約語を提供するクラス。

Modified: artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/ModelInputStreamTest.java
===================================================================
--- artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/ModelInputStreamTest.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ artemis/trunk/org.jiemamy.serializer/src/test/java/org/jiemamy/serializer/ModelInputStreamTest.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -31,7 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.jiemamy.extension.ReflectionDialectAccessStrategy;
+import org.jiemamy.ReflectionDialectAccessStrategy;
 import org.jiemamy.model.Artemis;
 import org.jiemamy.model.Jiemamy;
 import org.jiemamy.model.RootModel;

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectInstanceAccessStrategy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectInstanceAccessStrategy.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseDialectInstanceAccessStrategy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -20,9 +20,9 @@
 
 import org.eclipse.core.runtime.CoreException;
 
+import org.jiemamy.InstanceAccessStrategy;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.extension.InstanceAccessStrategy;
-import org.jiemamy.extension.dialect.Dialect;
 
 /**
  * TODO for daisuke

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterInstanceAccessStrategy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterInstanceAccessStrategy.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseExporterInstanceAccessStrategy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -20,9 +20,9 @@
 
 import org.eclipse.core.runtime.CoreException;
 
+import org.jiemamy.InstanceAccessStrategy;
+import org.jiemamy.composer.Exporter;
 import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.extension.InstanceAccessStrategy;
-import org.jiemamy.extension.composer.Exporter;
 
 /**
  * TODO for daisuke

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterInstanceAccessStrategy.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterInstanceAccessStrategy.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/EclipseImporterInstanceAccessStrategy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -20,9 +20,9 @@
 
 import org.eclipse.core.runtime.CoreException;
 
+import org.jiemamy.InstanceAccessStrategy;
+import org.jiemamy.composer.Importer;
 import org.jiemamy.exception.UnexpectedConditionError;
-import org.jiemamy.extension.InstanceAccessStrategy;
-import org.jiemamy.extension.composer.Importer;
 
 /**
  * TODO for daisuke

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/JiemamyPlugin.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -31,13 +31,13 @@
 import org.osgi.framework.BundleContext;
 import org.seasar.eclipse.common.util.ImageManager;
 
+import org.jiemamy.composer.Exporter;
+import org.jiemamy.composer.Importer;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.eclipse.extension.ExtensionResolver;
 import org.jiemamy.eclipse.extension.validator.ModelValidator;
 import org.jiemamy.eclipse.preference.JiemamyPreference;
 import org.jiemamy.eclipse.preference.JiemamyPreferenceImpl;
-import org.jiemamy.extension.composer.Exporter;
-import org.jiemamy.extension.composer.Importer;
-import org.jiemamy.extension.dialect.Dialect;
 import org.jiemamy.model.Artemis;
 import org.jiemamy.model.Jiemamy;
 

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ExportAction.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -30,11 +30,11 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IFileEditorInput;
 
+import org.jiemamy.composer.ExportContext;
+import org.jiemamy.composer.Exporter;
 import org.jiemamy.eclipse.editor.DiagramEditor2;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.exception.ExportException;
-import org.jiemamy.extension.composer.ExportContext;
-import org.jiemamy.extension.composer.Exporter;
 import org.jiemamy.model.RootModel;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/action/ImportAction.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -30,11 +30,11 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IFileEditorInput;
 
+import org.jiemamy.composer.ImportContext;
+import org.jiemamy.composer.Importer;
 import org.jiemamy.eclipse.editor.DiagramEditor2;
 import org.jiemamy.eclipse.utils.ExceptionHandler;
 import org.jiemamy.exception.ImportException;
-import org.jiemamy.extension.composer.ImportContext;
-import org.jiemamy.extension.composer.Importer;
 import org.jiemamy.model.RootModel;
 
 /**

Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/DiagramEditorContextMenuProvider.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -31,6 +31,8 @@
 import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.actions.ActionFactory;
 
+import org.jiemamy.composer.Exporter;
+import org.jiemamy.composer.Importer;
 import org.jiemamy.eclipse.JiemamyPlugin;
 import org.jiemamy.eclipse.action.AutoLayoutAction;
 import org.jiemamy.eclipse.action.ChangeNodeBackgroundColorAction;
@@ -39,8 +41,6 @@
 import org.jiemamy.eclipse.action.ImportAction;
 import org.jiemamy.eclipse.action.PropertyAction;
 import org.jiemamy.eclipse.action.SaveDiagramImageAction;
-import org.jiemamy.extension.composer.Exporter;
-import org.jiemamy.extension.composer.Importer;
 
 /**
  * コンテキストメニュープロバイダ。

Modified: zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/META-INF/MANIFEST.MF	2008-12-11 16:23:19 UTC (rev 2248)
@@ -8,10 +8,9 @@
 Eclipse-BuddyPolicy: registered
 Eclipse-LazyStart: false
 Export-Package: org.jiemamy,
+ org.jiemamy.composer,
+ org.jiemamy.dialect,
  org.jiemamy.exception,
- org.jiemamy.extension,
- org.jiemamy.extension.composer,
- org.jiemamy.extension.dialect,
  org.jiemamy.model,
  org.jiemamy.model.attribute,
  org.jiemamy.model.connection,

Copied: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/Context.java (from rev 2243, zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/Context.java)
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/Context.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/Context.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/09/17
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy;
+
+import java.util.Map;
+
+/**
+ * コンテキスト情報インターフェイス。
+ * @author daisuke
+ */
+public interface Context {
+	
+	/**
+	 * コンテキスト値のマップを取得する。
+	 * @return コンテキスト値のマップ
+	 */
+	Map<String, Object> getProperties();
+	
+	/**
+	 * コンテキスト値を取得する。
+	 * @param <T> コンテキスト値の型
+	 * @param key キー
+	 * @return コンテキスト値
+	 */
+	<T>T getValue(String key);
+	
+	/**
+	 * コンテキスト値のマップを設定する。
+	 * @param properties コンテキスト値のマップ
+	 */
+	void setProperties(Map<String, Object> properties);
+	
+	/**
+	 * コンテキスト値を設定する。
+	 * @param <T> コンテキスト値の型
+	 * @param key キー
+	 * @param value コンテキスト値
+	 */
+	<T>void setValue(String key, T value);
+}


Property changes on: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/Context.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/InstanceAccessStrategy.java (from rev 2246, zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/InstanceAccessStrategy.java)
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/InstanceAccessStrategy.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/InstanceAccessStrategy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/12/10
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy;
+
+/**
+ * インスタンスにアクセスする方法を示す戦略インターフェイス。
+ * @param <T> 対象インスタンスの型
+ * @author daisuke
+ */
+public interface InstanceAccessStrategy<T> {
+	
+	/**
+	* インスタンスを取得する。
+	* @param fqcn 完全修飾クラス名
+	* @return インスタンス
+	* @throws ClassNotFoundException 指定したクラスが見つからなかった場合
+	*/
+	T getInstance(String fqcn) throws ClassNotFoundException;
+	
+}


Property changes on: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/InstanceAccessStrategy.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer (from rev 2243, zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer)

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExportContext.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/ExportContext.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExportContext.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
-import org.jiemamy.extension.Context;
+import org.jiemamy.Context;
 
 /**
  * エクスポートに関するコンテキスト情報

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Exporter.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/Exporter.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Exporter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
 import org.jiemamy.exception.ExportException;
 import org.jiemamy.model.RootModel;

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExporterProvider.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/ExporterProvider.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ExporterProvider.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
-import org.jiemamy.extension.InstanceAccessStrategy;
+import org.jiemamy.InstanceAccessStrategy;
 
 /**
  * {@link Exporter}インスタンスの供給クラス。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImportContext.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/ImportContext.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImportContext.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
-import org.jiemamy.extension.Context;
+import org.jiemamy.Context;
 
 /**
  * インポートに関するコンテキスト情報インターフェイス。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Importer.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/Importer.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/Importer.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
 import org.jiemamy.exception.ImportException;
 import org.jiemamy.model.RootModel;

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImporterProvider.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/composer/ImporterProvider.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/composer/ImporterProvider.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,9 +16,9 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.composer;
+package org.jiemamy.composer;
 
-import org.jiemamy.extension.InstanceAccessStrategy;
+import org.jiemamy.InstanceAccessStrategy;
 
 /**
  * {@link Importer}インスタンスの供給クラス。

Copied: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect (from rev 2243, zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect)

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/ConnectionAdvisor.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/ConnectionAdvisor.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect;
+package org.jiemamy.dialect;
 
 import java.sql.Connection;
 

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/DataTypeResolver.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DataTypeResolver.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect;
+package org.jiemamy.dialect;
 
 import java.util.List;
 

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/Dialect.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,100 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/06/09
- *
- * This file is part of Jiemamy-core.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.extension.dialect;
-
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.jiemamy.model.InstanceCreationStrategy;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.AbstractEntityModel;
-import org.jiemamy.model.sql.SqlStatement;
-
-/**
- * SQL方言インターフェイス。
- * 
- * <p>実装クラスは、引数無しのデフォルトコンストラクタを持たなければならない。
- * また、実装クラスはステートレスである必要がある。</p>
- * 
- * @author daisuke
- */
-public interface Dialect {
-	
-	/**
-	 * エンティティ情報から{@link AbstractEntityModel}を生成する。
-	 * 
-	 * <p>渡したEntity情報がTABLEやVIEWではなかった場合（INDEX等）{@code null}を返す。</p>
-	 * 
-	 * @param rootModel 
-	 * @param entity エンティティ情報
-	 * @param meta DBメタデータ
-	 * @return 生成された {@link AbstractEntityModel}
-	 * @throws SQLException 
-	 */
-	AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) throws SQLException;
-	
-	/**
-	 * このSQL方言用の{@link ConnectionAdvisor}を取得する。
-	 * @return {@link ConnectionAdvisor}
-	 */
-	ConnectionAdvisor getAdvisor();
-	
-	/**
-	 * モデリング用DataType・一般型・型名間のマッピング情報を取得する。
-	 * @return マッピング情報
-	 */
-	DataTypeResolver getDataTypeResolver();
-	
-	/**
-	 * このSQL方言用の{@link Quoter}を取得する。
-	 * @return {@link Quoter}
-	 */
-	Quoter getQuoter();
-	
-	/**
-	 * このSQL方言用の{@link IdentifierValidator}を取得する。
-	 * @return {@link IdentifierValidator}
-	 */
-	IdentifierValidator getValidator();
-	
-	/**
-	 * SQL文のリストから、{@link RootModel} を生成する。
-	 * @param statements SQL文のリスト
-	 * @param strategy もでる生成戦略
-	 * @return 生成した{@link RootModel}
-	 * @throws UnsupportedOperationException
-	 */
-	RootModel toRootModel(List<SqlStatement> statements, InstanceCreationStrategy strategy);
-	
-	/**
-	 * {@link RootModel}からSQL文のリストを生成する。
-	 * @param rootModel {@link RootModel}
-	 * @return SQL文のリスト
-	 * @throws UnsupportedOperationException
-	 */
-	List<SqlStatement> toStatements(RootModel rootModel);
-	
-	/**
-	 * SQL方言IDを返す。
-	 * @return SQL方言ID
-	 */
-	String toString();
-}

Copied: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java (from rev 2244, zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/Dialect.java)
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java	                        (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Dialect.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/06/09
+ *
+ * This file is part of Jiemamy-core.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.dialect;
+
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.node.AbstractEntityModel;
+import org.jiemamy.model.sql.SqlStatement;
+
+/**
+ * SQL方言インターフェイス。
+ * 
+ * <p>実装クラスは、引数無しのデフォルトコンストラクタを持たなければならない。
+ * また、実装クラスはステートレスである必要がある。</p>
+ * 
+ * @author daisuke
+ */
+public interface Dialect {
+	
+	/**
+	 * エンティティ情報から{@link AbstractEntityModel}を生成する。
+	 * 
+	 * <p>渡したEntity情報がTABLEやVIEWではなかった場合（INDEX等）{@code null}を返す。</p>
+	 * 
+	 * @param rootModel 
+	 * @param entity エンティティ情報
+	 * @param meta DBメタデータ
+	 * @return 生成された {@link AbstractEntityModel}
+	 * @throws SQLException 
+	 */
+	AbstractEntityModel createEntity(RootModel rootModel, ResultSet entity, DatabaseMetaData meta) throws SQLException;
+	
+	/**
+	 * このSQL方言用の{@link ConnectionAdvisor}を取得する。
+	 * @return {@link ConnectionAdvisor}
+	 */
+	ConnectionAdvisor getAdvisor();
+	
+	/**
+	 * モデリング用DataType・一般型・型名間のマッピング情報を取得する。
+	 * @return マッピング情報
+	 */
+	DataTypeResolver getDataTypeResolver();
+	
+	/**
+	 * このSQL方言用の{@link Quoter}を取得する。
+	 * @return {@link Quoter}
+	 */
+	Quoter getQuoter();
+	
+	/**
+	 * このSQL方言用の{@link IdentifierValidator}を取得する。
+	 * @return {@link IdentifierValidator}
+	 */
+	IdentifierValidator getValidator();
+	
+	/**
+	 * SQL文のリストから、{@link RootModel} を生成する。
+	 * @param statements SQL文のリスト
+	 * @return 生成した{@link RootModel}
+	 * @throws UnsupportedOperationException
+	 */
+	RootModel toRootModel(List<SqlStatement> statements);
+	
+	/**
+	 * {@link RootModel}からSQL文のリストを生成する。
+	 * @param rootModel {@link RootModel}
+	 * @return SQL文のリスト
+	 * @throws UnsupportedOperationException
+	 */
+	List<SqlStatement> toStatements(RootModel rootModel);
+	
+	/**
+	 * SQL方言IDを返す。
+	 * @return SQL方言ID
+	 */
+	String toString();
+}

Deleted: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DialectProvider.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/DialectProvider.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/DialectProvider.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -1,97 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/12/10
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.extension.dialect;
-
-import org.jiemamy.extension.InstanceAccessStrategy;
-import org.jiemamy.model.RootModel;
-
-/**
- * {@link Dialect}インスタンスの供給クラス。
- * @author daisuke
- */
-public final class DialectProvider {
-	
-	/** 自クラスのインスタンス */
-	private static DialectProvider singleton;
-	
-
-	/**
-	 * TODO for dmiyamoto
-	 * @param rootModel
-	 * @return
-	 * @throws ClassNotFoundException 
-	 */
-	public static Dialect getDialect(RootModel rootModel) throws ClassNotFoundException {
-		return getDialect(rootModel.getDialectId());
-	}
-	
-	/**
-	 * {@link Dialect} のインスタンスを取得する。
-	 * @param fqcn 完全修飾クラス名
-	 * @return {@link Dialect}のインスタンス。
-	 * @throws ClassNotFoundException 
-	 * @throws IllegalStateException ファクトリが初期化されていない場合
-	 */
-	public static Dialect getDialect(String fqcn) throws ClassNotFoundException {
-		if (singleton == null) {
-			throw new IllegalStateException("Provider is not initialized");
-		}
-		return singleton.strategy.getInstance(fqcn);
-	}
-	
-	/**
-	* インスタンス生成戦略を取得する。
-	* @return インスタンス生成戦略
-	 * @throws IllegalStateException ファクトリが初期化されていない場合
-	*/
-	public static InstanceAccessStrategy<Dialect> getStrategy() {
-		if (singleton == null) {
-			throw new IllegalStateException("Provider is not initialized");
-		}
-		return singleton.strategy;
-	}
-	
-	/**
-	 * ファクトリを初期化する。
-	 * 
-	 * @param strategy 実装が提供するインスタンス取得戦略
-	 */
-	public static void init(InstanceAccessStrategy<Dialect> strategy) {
-		singleton = new DialectProvider(strategy);
-	}
-	
-
-	/** インスタンス生成戦略 */
-	private InstanceAccessStrategy<Dialect> strategy;
-	
-
-	/**
-	 * privateコンストラクタ。
-	 * @param strategy インスタンス生成戦略
-	 * @throws IllegalArgumentException 引数に{@code null}を与えた場合
-	 * @category instance creation
-	 */
-	private DialectProvider(InstanceAccessStrategy<Dialect> strategy) {
-		if (strategy == null) {
-			throw new IllegalArgumentException("strategy must not to be null.");
-		}
-		this.strategy = strategy;
-	}
-	
-}

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/IdentifierValidator.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/IdentifierValidator.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/IdentifierValidator.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect;
+package org.jiemamy.dialect;
 
 /**
  * 識別子の妥当性を判断するインターフェイス。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/MappingInfo.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/MappingInfo.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/MappingInfo.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect;
+package org.jiemamy.dialect;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Quoter.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/extension/dialect/Quoter.java	2008-12-11 10:27:22 UTC (rev 2243)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/dialect/Quoter.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -16,7 +16,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.jiemamy.extension.dialect;
+package org.jiemamy.dialect;
 
 /**
  * SQL文中の引用符処理を行うインターフェイス。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/DataTypeNotFoundException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/DataTypeNotFoundException.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/DataTypeNotFoundException.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.exception;
 
-import org.jiemamy.extension.dialect.Dialect;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.model.datatype.DataType;
 
 /**

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ExportException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ExportException.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ExportException.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.exception;
 
-import org.jiemamy.extension.composer.Exporter;
+import org.jiemamy.composer.Exporter;
 
 /**
  * {@link Exporter}実行時に問題が発生した場合にスローされる例外。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDataTypeResolverException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDataTypeResolverException.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDataTypeResolverException.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.exception;
 
-import org.jiemamy.extension.dialect.DataTypeResolver;
+import org.jiemamy.dialect.DataTypeResolver;
 import org.jiemamy.model.datatype.DataType;
 
 /**

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/IllegalDialectImplementationException.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.exception;
 
-import org.jiemamy.extension.dialect.Dialect;
+import org.jiemamy.dialect.Dialect;
 
 /**
  * SQL方言の実装が不正である時にスローされる例外。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ImportException.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ImportException.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/exception/ImportException.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -18,7 +18,7 @@
  */
 package org.jiemamy.exception;
 
-import org.jiemamy.extension.composer.Importer;
+import org.jiemamy.composer.Importer;
 
 /**
  * {@link Importer}実行時に問題が発生した場合にスローされる例外。

Modified: zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/Jiemamy.java
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/Jiemamy.java	2008-12-11 13:56:19 UTC (rev 2247)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/java/org/jiemamy/model/Jiemamy.java	2008-12-11 16:23:19 UTC (rev 2248)
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.UUID;
 
+import org.jiemamy.InstanceAccessStrategy;
+import org.jiemamy.dialect.Dialect;
 import org.jiemamy.exception.IllegalImplementationException;
-import org.jiemamy.extension.InstanceAccessStrategy;
-import org.jiemamy.extension.dialect.Dialect;
 
 /**
  * 新しいJiemamy関連クラスのインスタンスを生成するためのファクトリ。

• 前の記事 [Jiemamy-notify] commit [2247] 色々ミス修正。
• 次の記事 [Jiemamy-notify] commit [2249] パッケージ統一（org .jiemamy.extension. dialect → org .jiemamy. dialect）
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]