svnno****@sourc*****
svnno****@sourc*****
2009年 4月 10日 (金) 20:23:58 JST
Revision: 3208
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3208
Author: daisuke_m
Date: 2009-04-10 20:23:58 +0900 (Fri, 10 Apr 2009)
Log Message:
-----------
パッケージ移動refactor
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/AbstractJiemamyBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ColumnBuilderImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/DataTypeBuilderImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ForeignKeyBuilderImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/TableBuilderImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ViewBuilderImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/package-info.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/enhance/FactoryExtension.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ValidatorUtil.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/RootModelImplTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/builder/TableBuilderTest.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/RootModelUtilTest.java
hestia/trunk/jiemamy-hestia/mvn_install.bat
hestia/trunk/org.jiemamy.eclipse.core/.classpath
hestia/trunk/org.jiemamy.eclipse.core/META-INF/MANIFEST.MF
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/TargetModel.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ColumnBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/DataTypeBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ForeignKeyBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/JiemamyBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/TableBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ViewBuilder.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/package-info.java
Added Paths:
-----------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/JiemamyPropertyTest.java
artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/JiemamyViewPropertyTest.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/
Removed Paths:
-------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/JiemamyPropertyTest.java
artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewPropertyTest.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/ArtemisJiemamyFactory.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -30,6 +30,7 @@
import org.jiemamy.OptionalSpec;
import org.jiemamy.dialect.BuiltinDataTypeMold;
import org.jiemamy.exception.IllegalImplementationException;
+import org.jiemamy.experimental.builder.JiemamyBuilder;
import org.jiemamy.facade.JiemamyFacade;
import org.jiemamy.internal.enhance.FactoryExtension;
import org.jiemamy.internal.model.datatype.BuiltinDataTypeImpl;
@@ -47,7 +48,6 @@
import org.jiemamy.model.entity.TableRef;
import org.jiemamy.serializer.JiemamySerializer;
import org.jiemamy.utils.ValidateUtil;
-import org.jiemamy.utils.builder.JiemamyBuilder;
/**
* {@link JiemamyFactory}のArtemis用実装。
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/AbstractJiemamyBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/AbstractJiemamyBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/AbstractJiemamyBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -16,11 +16,12 @@
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.internal.builder;
import org.apache.commons.lang.Validate;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.experimental.builder.JiemamyBuilder;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ColumnBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilderImpl.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ColumnBuilderImpl.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -16,11 +16,12 @@
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.internal.builder;
import org.apache.commons.lang.Validate;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.experimental.builder.ColumnBuilder;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.constraint.ColumnConstraint;
import org.jiemamy.model.attribute.constraint.ConstraintModel;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/DataTypeBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilderImpl.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/DataTypeBuilderImpl.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.internal.builder;
import org.apache.commons.lang.Validate;
@@ -24,6 +24,7 @@
import org.jiemamy.dialect.BuiltinDataTypeMold;
import org.jiemamy.dialect.Dialect;
import org.jiemamy.dialect.generic.GenericDialect;
+import org.jiemamy.experimental.builder.DataTypeBuilder;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.model.datatype.DataTypeCategory;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ForeignKeyBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilderImpl.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ForeignKeyBuilderImpl.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.internal.builder;
import java.util.List;
@@ -25,6 +25,7 @@
import org.jiemamy.JiemamyFactory;
import org.jiemamy.ReferenceResolver;
import org.jiemamy.exception.ModelConsistenceException;
+import org.jiemamy.experimental.builder.ForeignKeyBuilder;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.ColumnRef;
import org.jiemamy.model.attribute.constraint.ForeignKey;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/TableBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/TableBuilderImpl.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/TableBuilderImpl.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -16,11 +16,12 @@
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.internal.builder;
import org.apache.commons.lang.Validate;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.experimental.builder.TableBuilder;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.attribute.constraint.PrimaryKey;
import org.jiemamy.model.entity.TableModel;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ViewBuilderImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/ViewBuilderImpl.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/ViewBuilderImpl.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -16,11 +16,12 @@
* either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.internal.builder;
import org.apache.commons.lang.Validate;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.experimental.builder.ViewBuilder;
import org.jiemamy.model.entity.ViewModel;
/**
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/package-info.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/builder/package-info.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/builder/package-info.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -3,5 +3,5 @@
*
* @author daisuke
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.internal.builder;
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/enhance/FactoryExtension.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/enhance/FactoryExtension.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/internal/enhance/FactoryExtension.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -33,6 +33,10 @@
import org.jiemamy.ReferenceResolver;
import org.jiemamy.dialect.generic.GenericDialect;
import org.jiemamy.exception.UnexpectedConditionError;
+import org.jiemamy.experimental.builder.ColumnBuilder;
+import org.jiemamy.experimental.builder.TableBuilder;
+import org.jiemamy.internal.builder.ColumnBuilderImpl;
+import org.jiemamy.internal.builder.TableBuilderImpl;
import org.jiemamy.internal.model.RootModelImpl;
import org.jiemamy.internal.model.attribute.ColumnModelImpl;
import org.jiemamy.internal.model.attribute.ColumnRefImpl;
@@ -78,10 +82,6 @@
import org.jiemamy.model.index.IndexModel;
import org.jiemamy.utils.Disablable;
import org.jiemamy.utils.DisablableImpl;
-import org.jiemamy.utils.builder.ColumnBuilder;
-import org.jiemamy.utils.builder.ColumnBuilderImpl;
-import org.jiemamy.utils.builder.TableBuilder;
-import org.jiemamy.utils.builder.TableBuilderImpl;
/**
* factory-enhancerによる拡張ポイントとなる。
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ValidatorUtil.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ValidatorUtil.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/utils/ValidatorUtil.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -21,11 +21,10 @@
import java.util.Collection;
import org.jiemamy.validator.Problem;
-import org.jiemamy.validator.Validator;
import org.jiemamy.validator.Problem.Severity;
/**
- * {@link Validator}用ユーティリティクラス。
+ * TODO for daisuke
*
* @author daisuke
*/
@@ -41,7 +40,7 @@
public static int sizeOf(Collection<Problem> problems, Severity severity) {
int count = 0;
for (Problem problem : problems) {
- if (problem.getSeverity().getValue() >= severity.getValue()) {
+ if (problem.getSeverity().ordinal() <= severity.ordinal()) {
count++;
}
}
Copied: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/JiemamyPropertyTest.java (from rev 3205, artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/JiemamyPropertyTest.java)
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/JiemamyPropertyTest.java (rev 0)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/JiemamyPropertyTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/01/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;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.apache.commons.lang.ClassUtils;
+import org.junit.Test;
+
+import org.jiemamy.JiemamyProperty;
+import org.jiemamy.TargetModel;
+import org.jiemamy.internal.model.attribute.constraint.AbstractConstraintModel;
+import org.jiemamy.utils.ReflectionUtil;
+
+/**
+ * {@link JiemamyProperty}のテストクラス。
+ *
+ * @author daisuke
+ */
+public class JiemamyPropertyTest {
+
+ /**
+ * 各モデルのインターフェイスは、{@link JiemamyProperty}で示されるgetterを持つべきである。
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test01_ModelHasGetter() throws Exception {
+ for (Class<?> enumClass : JiemamyProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(enumClass) == false) {
+ continue;
+ }
+
+ TargetModel annot = enumClass.getAnnotation(TargetModel.class);
+ assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
+
+ Class<?> targetModelClass = annot.value();
+ for (Field field : enumClass.getFields()) {
+ String iserName = ReflectionUtil.convertFieldToAccessorName(field, "is");
+ String getterName = ReflectionUtil.convertFieldToAccessorName(field, "get");
+ try {
+ targetModelClass.getMethod(getterName);
+ } catch (NoSuchMethodException e) {
+ Method iserMethod;
+ try {
+ iserMethod = targetModelClass.getMethod(iserName);
+ if (iserMethod.getReturnType() != Boolean.class && iserMethod.getReturnType() != boolean.class) {
+ fail(targetModelClass.getName() + " is not have " + getterName);
+ }
+ } catch (NoSuchMethodException e2) {
+ fail(targetModelClass.getName() + " is not have " + getterName + " or " + iserName);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 各モデルの実装クラスは、{@link JiemamyProperty}で示されるフィールドを持つべきである。
+ *
+ * <p>Artemis特有。仕様ではない。</p>
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test02_ModelHasField() throws Exception {
+ for (Class<?> enumClass : JiemamyProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(enumClass) == false) {
+ continue;
+ }
+
+ TargetModel annot = enumClass.getAnnotation(TargetModel.class);
+ assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
+
+ Class<?> interfaceClass = annot.value();
+ String implClassName = interfaceClass.getName() + "Impl";
+ implClassName = implClassName.replace(".model.", ".internal.model.");
+
+ Class<?> targetModelClass;
+ try {
+ targetModelClass = Class.forName(implClassName);
+ } catch (ClassNotFoundException e) {
+ String packageName = ClassUtils.getPackageName(interfaceClass);
+ packageName = packageName.replace(".model.", ".internal.model.");
+ String shortClassName = ClassUtils.getShortClassName(interfaceClass);
+
+ implClassName = packageName + ".Abstract" + shortClassName;
+ targetModelClass = Class.forName(implClassName);
+ }
+
+ Field[] enumFields = enumClass.getFields();
+ for (Field enumField : enumFields) {
+ try {
+ targetModelClass.getDeclaredField(enumField.getName());
+ } catch (NoSuchFieldException e) {
+ if (targetModelClass == AbstractConstraintModel.class && enumField.getName() == "name") {
+ // 例外 success
+ } else {
+ fail(targetModelClass.getName() + " is not have " + enumField.getName());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * {@link JiemamyProperty}は、各モデルのインターフェイスのgetterで示されるプロパティを網羅すべきである。
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test03_PropertyHasFieldName() throws Exception {
+ for (Class<?> clazz : JiemamyProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(clazz) == false) {
+ continue;
+ }
+ TargetModel annot = clazz.getAnnotation(TargetModel.class);
+ Class<?> targetModelClass = annot.value();
+ Method[] methods = targetModelClass.getDeclaredMethods();
+ for (Method method : methods) {
+ if (ReflectionUtil.isGetter(method) == false) {
+ continue;
+ }
+ String fieldName = ReflectionUtil.convertAccessorToFieldName(method);
+ try {
+ clazz.getField(fieldName);
+ } catch (NoSuchFieldException e) {
+ if (Arrays.asList("adapter", "adapters").contains(fieldName) == false) {
+ fail(clazz.getName() + " is not have " + fieldName);
+ }
+ }
+ }
+ }
+
+ }
+}
Property changes on: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/JiemamyPropertyTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/JiemamyPropertyTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/JiemamyPropertyTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/JiemamyPropertyTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -1,159 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/01/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.internal;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-
-import org.apache.commons.lang.ClassUtils;
-import org.junit.Test;
-
-import org.jiemamy.JiemamyProperty;
-import org.jiemamy.TargetModel;
-import org.jiemamy.internal.model.attribute.constraint.AbstractConstraintModel;
-import org.jiemamy.utils.ReflectionUtil;
-
-/**
- * {@link JiemamyProperty}のテストクラス。
- *
- * @author daisuke
- */
-public class JiemamyPropertyTest {
-
- /**
- * 各モデルのインターフェイスは、{@link JiemamyProperty}で示されるgetterを持つべきである。
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test01_ModelHasGetter() throws Exception {
- for (Class<?> enumClass : JiemamyProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(enumClass) == false) {
- continue;
- }
-
- TargetModel annot = enumClass.getAnnotation(TargetModel.class);
- assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
-
- Class<?> targetModelClass = annot.value();
- for (Field field : enumClass.getFields()) {
- String iserName = ReflectionUtil.convertFieldToAccessorName(field, "is");
- String getterName = ReflectionUtil.convertFieldToAccessorName(field, "get");
- try {
- targetModelClass.getMethod(getterName);
- } catch (NoSuchMethodException e) {
- Method iserMethod;
- try {
- iserMethod = targetModelClass.getMethod(iserName);
- if (iserMethod.getReturnType() != Boolean.class && iserMethod.getReturnType() != boolean.class) {
- fail(targetModelClass.getName() + " is not have " + getterName);
- }
- } catch (NoSuchMethodException e2) {
- fail(targetModelClass.getName() + " is not have " + getterName + " or " + iserName);
- }
- }
- }
- }
- }
-
- /**
- * 各モデルの実装クラスは、{@link JiemamyProperty}で示されるフィールドを持つべきである。
- *
- * <p>Artemis特有。仕様ではない。</p>
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test02_ModelHasField() throws Exception {
- for (Class<?> enumClass : JiemamyProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(enumClass) == false) {
- continue;
- }
-
- TargetModel annot = enumClass.getAnnotation(TargetModel.class);
- assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
-
- Class<?> interfaceClass = annot.value();
- String implClassName = interfaceClass.getName() + "Impl";
- implClassName = implClassName.replace(".model.", ".internal.model.");
-
- Class<?> targetModelClass;
- try {
- targetModelClass = Class.forName(implClassName);
- } catch (ClassNotFoundException e) {
- String packageName = ClassUtils.getPackageName(interfaceClass);
- packageName = packageName.replace(".model.", ".internal.model.");
- String shortClassName = ClassUtils.getShortClassName(interfaceClass);
-
- implClassName = packageName + ".Abstract" + shortClassName;
- targetModelClass = Class.forName(implClassName);
- }
-
- Field[] enumFields = enumClass.getFields();
- for (Field enumField : enumFields) {
- try {
- targetModelClass.getDeclaredField(enumField.getName());
- } catch (NoSuchFieldException e) {
- if (targetModelClass == AbstractConstraintModel.class && enumField.getName() == "name") {
- // 例外 success
- } else {
- fail(targetModelClass.getName() + " is not have " + enumField.getName());
- }
- }
- }
- }
- }
-
- /**
- * {@link JiemamyProperty}は、各モデルのインターフェイスのgetterで示されるプロパティを網羅すべきである。
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test03_PropertyHasFieldName() throws Exception {
- for (Class<?> clazz : JiemamyProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(clazz) == false) {
- continue;
- }
- TargetModel annot = clazz.getAnnotation(TargetModel.class);
- Class<?> targetModelClass = annot.value();
- Method[] methods = targetModelClass.getDeclaredMethods();
- for (Method method : methods) {
- if (ReflectionUtil.isGetter(method) == false) {
- continue;
- }
- String fieldName = ReflectionUtil.convertAccessorToFieldName(method);
- try {
- clazz.getField(fieldName);
- } catch (NoSuchFieldException e) {
- if (Arrays.asList("adapter", "adapters").contains(fieldName) == false) {
- fail(clazz.getName() + " is not have " + fieldName);
- }
- }
- }
- }
-
- }
-}
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/RootModelImplTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/RootModelImplTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/RootModelImplTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -31,12 +31,12 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.internal.builder.DataTypeBuilderImpl;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.constraint.ForeignKey;
import org.jiemamy.model.datatype.DataTypeCategory;
import org.jiemamy.model.datatype.DomainModel;
import org.jiemamy.model.entity.TableModel;
-import org.jiemamy.utils.builder.DataTypeBuilderImpl;
import org.jiemamy.utils.model.AttributeUtil;
/**
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/model/node/TableModelImplTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -31,12 +31,12 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.internal.builder.DataTypeBuilderImpl;
import org.jiemamy.internal.model.entity.TableModelImpl;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.datatype.DataTypeCategory;
import org.jiemamy.model.entity.TableModel;
-import org.jiemamy.utils.builder.DataTypeBuilderImpl;
import org.jiemamy.utils.model.TableUtil;
/**
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/builder/TableBuilderTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/builder/TableBuilderTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/builder/TableBuilderTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -28,6 +28,10 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
+import org.jiemamy.experimental.builder.TableBuilder;
+import org.jiemamy.internal.builder.ColumnBuilderImpl;
+import org.jiemamy.internal.builder.DataTypeBuilderImpl;
+import org.jiemamy.internal.builder.TableBuilderImpl;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.datatype.DataType;
import org.jiemamy.model.datatype.DataTypeCategory;
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/RootModelUtilTest.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/RootModelUtilTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/utils/model/RootModelUtilTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -31,13 +31,13 @@
import org.jiemamy.JiemamyFactory;
import org.jiemamy.dialect.Dialect;
import org.jiemamy.dialect.generic.GenericDialect;
+import org.jiemamy.internal.builder.TableBuilderImpl;
+import org.jiemamy.internal.builder.ViewBuilderImpl;
import org.jiemamy.internal.test.ReflectionDialectProvider;
import org.jiemamy.internal.test.CoreTestModelBuilder;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.entity.ViewModel;
-import org.jiemamy.utils.builder.TableBuilderImpl;
-import org.jiemamy.utils.builder.ViewBuilderImpl;
/**
* {@link RootModelUtil}のテストクラス。
Copied: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/JiemamyViewPropertyTest.java (from rev 3205, artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewPropertyTest.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/JiemamyViewPropertyTest.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/JiemamyViewPropertyTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/03/01
+ *
+ * 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 static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import org.apache.commons.lang.ClassUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.jiemamy.JiemamyProperty;
+import org.jiemamy.JiemamyViewProperty;
+import org.jiemamy.TargetModel;
+import org.jiemamy.internal.model.attribute.constraint.AbstractConstraintModel;
+import org.jiemamy.utils.ReflectionUtil;
+
+/**
+ * {@link JiemamyViewProperty}のテストクラス。
+ * <p>j-core内のJiemamyPropertyテストクラスのコピー。</p>
+ *
+ * @author shin1ogawa
+ */
+public class JiemamyViewPropertyTest {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JiemamyViewProperty.class);
+
+
+ /**
+ * 各モデルのインターフェイスは、{@link JiemamyProperty}で示されるgetterを持つべきである。
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test01_ModelHasGetter() throws Exception {
+ for (Class<?> enumClass : JiemamyViewProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(enumClass) == false) {
+ continue;
+ }
+ LOGGER.debug("target enumClass: " + enumClass.getSimpleName());
+ TargetModel annot = enumClass.getAnnotation(TargetModel.class);
+ assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
+
+ Class<?> targetModelClass = annot.value();
+ for (Field field : enumClass.getFields()) {
+ String iserName = ReflectionUtil.convertFieldToAccessorName(field, "is");
+ String getterName = ReflectionUtil.convertFieldToAccessorName(field, "get");
+ try {
+ targetModelClass.getMethod(getterName);
+ } catch (NoSuchMethodException e) {
+ Method iserMethod;
+ try {
+ iserMethod = targetModelClass.getMethod(iserName);
+ if (iserMethod.getReturnType() != Boolean.class && iserMethod.getReturnType() != boolean.class) {
+ fail(targetModelClass.getName() + " is not have " + getterName);
+ }
+ } catch (NoSuchMethodException e2) {
+ fail(targetModelClass.getName() + " is not have " + getterName + " or " + iserName);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 各モデルの実装クラスは、{@link JiemamyProperty}で示されるフィールドを持つべきである。
+ *
+ * <p>Artemis特有。仕様ではない。</p>
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test02_ModelHasField() throws Exception {
+ for (Class<?> enumClass : JiemamyViewProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(enumClass) == false) {
+ continue;
+ }
+
+ LOGGER.debug("target enumClass: " + enumClass.getSimpleName());
+ TargetModel annot = enumClass.getAnnotation(TargetModel.class);
+ assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
+
+ Class<?> interfaceClass = annot.value();
+ String implClassName = interfaceClass.getName() + "Impl";
+ implClassName = implClassName.replace(".model.", ".internal.model.");
+
+ Class<?> targetModelClass;
+ try {
+ targetModelClass = Class.forName(implClassName);
+ } catch (ClassNotFoundException e) {
+ String packageName = ClassUtils.getPackageName(interfaceClass);
+ packageName = packageName.replace(".model.", ".internal.model.");
+ String shortClassName = ClassUtils.getShortClassName(interfaceClass);
+
+ implClassName = packageName + ".Abstract" + shortClassName;
+ try {
+ targetModelClass = Class.forName(implClassName);
+ } catch (ClassNotFoundException e2) {
+ e2.printStackTrace();
+ continue;
+ }
+ }
+
+ Field[] enumFields = enumClass.getFields();
+ for (Field enumField : enumFields) {
+ try {
+ targetModelClass.getDeclaredField(enumField.getName());
+ } catch (NoSuchFieldException e) {
+ if (targetModelClass == AbstractConstraintModel.class && enumField.getName() == "name") {
+ // 例外 success
+ } else {
+ fail(targetModelClass.getName() + " is not have " + enumField.getName());
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * {@link JiemamyProperty}は、各モデルのインターフェイスのgetterで示されるプロパティを網羅すべきである。
+ *
+ * @throws Exception 例外が発生した場合
+ */
+ @Test
+ public void test03_PropertyHasFieldName() throws Exception {
+ for (Class<?> clazz : JiemamyViewProperty.class.getClasses()) {
+ if (Enum.class.isAssignableFrom(clazz) == false) {
+ continue;
+ }
+ LOGGER.debug("target enumClass: " + clazz.getSimpleName());
+ TargetModel annot = clazz.getAnnotation(TargetModel.class);
+ Class<?> targetModelClass = annot.value();
+ Method[] methods = targetModelClass.getDeclaredMethods();
+ for (Method method : methods) {
+ if (ReflectionUtil.isGetter(method) == false) {
+ continue;
+ }
+ String fieldName = ReflectionUtil.convertAccessorToFieldName(method);
+ try {
+ clazz.getField(fieldName);
+ } catch (NoSuchFieldException e) {
+ fail(clazz.getName() + " is not have " + fieldName);
+ }
+ }
+ }
+
+ }
+}
Property changes on: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/JiemamyViewPropertyTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewPropertyTest.java
===================================================================
--- artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewPropertyTest.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ artemis/trunk/jiemamy-view/src/test/java/org/jiemamy/internal/JiemamyViewPropertyTest.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -1,170 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/03/01
- *
- * 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.internal;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang.ClassUtils;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.jiemamy.JiemamyProperty;
-import org.jiemamy.JiemamyViewProperty;
-import org.jiemamy.TargetModel;
-import org.jiemamy.internal.model.attribute.constraint.AbstractConstraintModel;
-import org.jiemamy.utils.ReflectionUtil;
-
-/**
- * {@link JiemamyViewProperty}のテストクラス。
- * <p>j-core内のJiemamyPropertyテストクラスのコピー。</p>
- *
- * @author shin1ogawa
- */
-public class JiemamyViewPropertyTest {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(JiemamyViewProperty.class);
-
-
- /**
- * 各モデルのインターフェイスは、{@link JiemamyProperty}で示されるgetterを持つべきである。
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test01_ModelHasGetter() throws Exception {
- for (Class<?> enumClass : JiemamyViewProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(enumClass) == false) {
- continue;
- }
- LOGGER.debug("target enumClass: " + enumClass.getSimpleName());
- TargetModel annot = enumClass.getAnnotation(TargetModel.class);
- assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
-
- Class<?> targetModelClass = annot.value();
- for (Field field : enumClass.getFields()) {
- String iserName = ReflectionUtil.convertFieldToAccessorName(field, "is");
- String getterName = ReflectionUtil.convertFieldToAccessorName(field, "get");
- try {
- targetModelClass.getMethod(getterName);
- } catch (NoSuchMethodException e) {
- Method iserMethod;
- try {
- iserMethod = targetModelClass.getMethod(iserName);
- if (iserMethod.getReturnType() != Boolean.class && iserMethod.getReturnType() != boolean.class) {
- fail(targetModelClass.getName() + " is not have " + getterName);
- }
- } catch (NoSuchMethodException e2) {
- fail(targetModelClass.getName() + " is not have " + getterName + " or " + iserName);
- }
- }
- }
- }
- }
-
- /**
- * 各モデルの実装クラスは、{@link JiemamyProperty}で示されるフィールドを持つべきである。
- *
- * <p>Artemis特有。仕様ではない。</p>
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test02_ModelHasField() throws Exception {
- for (Class<?> enumClass : JiemamyViewProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(enumClass) == false) {
- continue;
- }
-
- LOGGER.debug("target enumClass: " + enumClass.getSimpleName());
- TargetModel annot = enumClass.getAnnotation(TargetModel.class);
- assertThat("JiemamyPropertyの内部列挙型はTargetModelアノテーションを持たなければならない", annot, is(notNullValue()));
-
- Class<?> interfaceClass = annot.value();
- String implClassName = interfaceClass.getName() + "Impl";
- implClassName = implClassName.replace(".model.", ".internal.model.");
-
- Class<?> targetModelClass;
- try {
- targetModelClass = Class.forName(implClassName);
- } catch (ClassNotFoundException e) {
- String packageName = ClassUtils.getPackageName(interfaceClass);
- packageName = packageName.replace(".model.", ".internal.model.");
- String shortClassName = ClassUtils.getShortClassName(interfaceClass);
-
- implClassName = packageName + ".Abstract" + shortClassName;
- try {
- targetModelClass = Class.forName(implClassName);
- } catch (ClassNotFoundException e2) {
- e2.printStackTrace();
- continue;
- }
- }
-
- Field[] enumFields = enumClass.getFields();
- for (Field enumField : enumFields) {
- try {
- targetModelClass.getDeclaredField(enumField.getName());
- } catch (NoSuchFieldException e) {
- if (targetModelClass == AbstractConstraintModel.class && enumField.getName() == "name") {
- // 例外 success
- } else {
- fail(targetModelClass.getName() + " is not have " + enumField.getName());
- }
- }
- }
- }
- }
-
- /**
- * {@link JiemamyProperty}は、各モデルのインターフェイスのgetterで示されるプロパティを網羅すべきである。
- *
- * @throws Exception 例外が発生した場合
- */
- @Test
- public void test03_PropertyHasFieldName() throws Exception {
- for (Class<?> clazz : JiemamyViewProperty.class.getClasses()) {
- if (Enum.class.isAssignableFrom(clazz) == false) {
- continue;
- }
- LOGGER.debug("target enumClass: " + clazz.getSimpleName());
- TargetModel annot = clazz.getAnnotation(TargetModel.class);
- Class<?> targetModelClass = annot.value();
- Method[] methods = targetModelClass.getDeclaredMethods();
- for (Method method : methods) {
- if (ReflectionUtil.isGetter(method) == false) {
- continue;
- }
- String fieldName = ReflectionUtil.convertAccessorToFieldName(method);
- try {
- clazz.getField(fieldName);
- } catch (NoSuchFieldException e) {
- fail(clazz.getName() + " is not have " + fieldName);
- }
- }
- }
-
- }
-}
Modified: hestia/trunk/jiemamy-hestia/mvn_install.bat
===================================================================
--- hestia/trunk/jiemamy-hestia/mvn_install.bat 2009-04-10 10:26:05 UTC (rev 3207)
+++ hestia/trunk/jiemamy-hestia/mvn_install.bat 2009-04-10 11:23:58 UTC (rev 3208)
@@ -26,6 +26,6 @@
) ELSE (
SET MAVEN_OPTS=-Xmx512M
)
-call mvn clean install
+call mvn -o clean install
pause
Modified: hestia/trunk/org.jiemamy.eclipse.core/.classpath
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.core/.classpath 2009-04-10 10:26:05 UTC (rev 3207)
+++ hestia/trunk/org.jiemamy.eclipse.core/.classpath 2009-04-10 11:23:58 UTC (rev 3208)
@@ -4,10 +4,10 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="lib/logback-core-0.9.15.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/logback-classic-0.9.15.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/logback-core-0.9.15.jar" sourcepath="lib/sources/logback-core-0.9.15-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/logback-classic-0.9.15.jar" sourcepath="lib/sources/logback-classic-0.9.15-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.5.6.jar" sourcepath="lib/sources/jcl-over-slf4j-1.5.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.6.jar" sourcepath="lib/sources/slf4j-api-1.5.6-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-1.8.jar" sourcepath="lib/sources/opencsv-1.8-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/eclipse-common-0.0.4.jar" sourcepath="lib/sources/eclipse-common-0.0.4-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/collections-generic-4.01.jar" sourcepath="lib/sources/collections-generic-4.01-sources.jar"/>
Modified: hestia/trunk/org.jiemamy.eclipse.core/META-INF/MANIFEST.MF
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.core/META-INF/MANIFEST.MF 2009-04-10 10:26:05 UTC (rev 3207)
+++ hestia/trunk/org.jiemamy.eclipse.core/META-INF/MANIFEST.MF 2009-04-10 11:23:58 UTC (rev 3208)
@@ -35,10 +35,12 @@
ch.qos.logback.classic.jmx,
ch.qos.logback.classic.joran,
ch.qos.logback.classic.joran.action,
+ ch.qos.logback.classic.log4j,
ch.qos.logback.classic.net,
ch.qos.logback.classic.pattern,
ch.qos.logback.classic.selector,
ch.qos.logback.classic.selector.servlet,
+ ch.qos.logback.classic.sift,
ch.qos.logback.classic.spi,
ch.qos.logback.classic.turbo,
ch.qos.logback.classic.util,
@@ -61,6 +63,7 @@
ch.qos.logback.core.read,
ch.qos.logback.core.rolling,
ch.qos.logback.core.rolling.helper,
+ ch.qos.logback.core.sift,
ch.qos.logback.core.spi,
ch.qos.logback.core.status,
ch.qos.logback.core.util,
@@ -147,7 +150,6 @@
org.jiemamy.model.sql,
org.jiemamy.serializer,
org.jiemamy.utils,
- org.jiemamy.utils.builder,
org.jiemamy.utils.enhancer,
org.jiemamy.utils.enhancer.helper,
org.jiemamy.utils.gtree.converter,
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/action/ExportAction.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/action/ExportAction.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/action/ExportAction.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -41,7 +41,7 @@
import org.jiemamy.composer.ExportConfig;
import org.jiemamy.composer.ExportException;
import org.jiemamy.composer.Exporter;
-import org.jiemamy.composer.exporter.FileExportConfig;
+import org.jiemamy.composer.FileExportConfig;
import org.jiemamy.eclipse.editor.JiemamyEditor;
import org.jiemamy.eclipse.ui.ExporterWizard;
import org.jiemamy.eclipse.utils.ExceptionHandler;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/JiemamyFactory.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -22,6 +22,7 @@
import java.util.UUID;
import org.jiemamy.exception.IllegalImplementationException;
+import org.jiemamy.experimental.builder.JiemamyBuilder;
import org.jiemamy.facade.JiemamyFacade;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
@@ -34,7 +35,6 @@
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.model.entity.TableRef;
import org.jiemamy.serializer.JiemamySerializer;
-import org.jiemamy.utils.builder.JiemamyBuilder;
/**
* Jiemamy関連のインスタンスを生成するファクトリインターフェイス。
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/TargetModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/TargetModel.java 2009-04-10 10:26:05 UTC (rev 3207)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/TargetModel.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -33,7 +33,7 @@
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
-public @interface TargetModel {
+ ＠ interface TargetModel {
/** プロパティ記述対象のインターフェイス */
Class<? extends JiemamyElement> value();
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ColumnBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ColumnBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ColumnBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.model.attribute.ColumnModel;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/DataTypeBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/DataTypeBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/DataTypeBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.utils.AdapterNotFoundException;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ForeignKeyBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ForeignKeyBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ForeignKeyBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.exception.ElementNotFoundException;
import org.jiemamy.exception.ModelConsistenceException;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/JiemamyBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/JiemamyBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/JiemamyBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.model.JiemamyElement;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/TableBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/TableBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/TableBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.model.attribute.ColumnModel;
import org.jiemamy.model.entity.TableModel;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ViewBuilder.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/ViewBuilder.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/ViewBuilder.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -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.utils.builder;
+package org.jiemamy.experimental.builder;
import org.jiemamy.model.entity.ViewModel;
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/package-info.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/utils/builder/package-info.java 2009-04-09 08:50:45 UTC (rev 3205)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/experimental/builder/package-info.java 2009-04-10 11:23:58 UTC (rev 3208)
@@ -3,5 +3,5 @@
*
* @author daisuke
*/
-package org.jiemamy.utils.builder;
+package org.jiemamy.experimental.builder;