- Eugene-commits - mailman.cloud.codelutin.com

r1015 - in trunk: eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/models/object eugene/src/main/resolver-cache/META-INF eugene/src/main/resolver-cache/META-INF/services eugene/src/test/java/org/nuiton/eugene maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-29 00:16:57 +0100 (Mon, 29 Nov 2010) New Revision: 1015 Url: http://nuiton.org/repositories/revision/eugene/1015 Log: Evolution #1113: Introduce a safe api to manager tag values and stereotypes Added: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java trunk/eugene/src/main/resolver-cache/META-INF/services/ trunk/eugene/src/main/resolver-cache/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java Removed: trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -46,7 +46,7 @@ * @see JavaBeanTransformer * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) */ - @StereotypeDefinition(target = ObjectModelClassifier.class) + @ModelPropertiesUtil.StereotypeDefinition(target = ObjectModelClassifier.class) String STEREOTYPE_BEAN = "bean"; /** @@ -54,6 +54,6 @@ * * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute) */ - @StereotypeDefinition(target = ObjectModelAttribute.class) + @ModelPropertiesUtil.StereotypeDefinition(target = ObjectModelAttribute.class) String STEREOTYPE_INDEXED = "indexed"; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -50,10 +50,10 @@ * used while reading the properties associated with a model and if found is * directly set to the {@code version} field of the model. * - * @see ObjectModelReader#loadModelTagvalue(ObjectModel, String, String) + * @see ObjectModelReader#loadModelTagValue(ObjectModel, String, String) * @since 2.3 */ - @TagValueDefinition(target = {ObjectModel.class}) + @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class}) String TAG_VERSION = "version"; /** @@ -65,7 +65,7 @@ * @see JavaGeneratorUtil#getConstantPrefixTagValue(ObjectModel, ObjectModelClassifier) * @since 2.3 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) + @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_CONSTANT_PREFIX = "constantPrefix"; /** @@ -77,7 +77,7 @@ * @see JavaGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier) * @since 2.3 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) + @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_NO_PCS = "noPCS"; /** @@ -88,6 +88,6 @@ * @see JavaGeneratorUtil#getI18nPrefixTagValue(ObjectModelElement, ObjectModel) * @since 2.3 */ - @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) + @ModelPropertiesUtil.TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_I18N_PREFIX = "i18n"; } Added: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -0,0 +1,259 @@ +package org.nuiton.eugene; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.TreeMap; + +/** + * Util class which introduces all the stuff to make usage of stereotype + * and tag values safe. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ +public class ModelPropertiesUtil { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ModelPropertiesUtil.class); + + /** the shared store of known tag values and stereotypes. */ + public static ModelPropertiesProvider store; + + public static Class<?>[] getTagValueTarget(String tagValueName) { + return getStore().getTagValueTarget(tagValueName); + } + + public static Class<?>[] getStereotypeTarget(String tagValueName) { + return getStore().getStereotypeTarget(tagValueName); + } + + public static ModelPropertiesProvider initStore(ClassLoader loader) { + + if (loader == null) { + + // use the current thread loader + loader = Thread.currentThread().getContextClassLoader(); + } + + store = new AggregateModelPropertiesProvider(loader); + try { + store.init(); + } catch (Exception e) { + throw new RuntimeException("Could not init store of tag values and stereotypes", e); + } + return store; + } + + public static ModelPropertiesProvider getStore() { + if (store == null) { + + store = initStore(null); + } + return store; + } + + /** + * The Eugene provider of tag values and stereotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ + public static class EugeneModelPropertiesProvider extends ModelPropertiesProvider { + + @Override + protected void init() throws IllegalAccessException { + scanStereotypeClass(EugeneStereoTypes.class); + scanTagValueClass(EugeneTagValues.class); + } + } + + /** + * A aggregate provider to box all the ones registred in the class-path via the + * {@link ServiceLoader} api. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ + public static class AggregateModelPropertiesProvider extends ModelPropertiesProvider { + + ClassLoader loader; + + public AggregateModelPropertiesProvider(ClassLoader loader) { + this.loader = loader; + } + + @Override + protected void init() throws Exception { + ServiceLoader<ModelPropertiesProvider> loader; + loader = ServiceLoader.load(ModelPropertiesProvider.class, this.loader); + for (ModelPropertiesProvider provider : loader) { + if (log.isInfoEnabled()) { + log.info("Will init model properties provider " + provider); + } + provider.init(); + getStereotypeStore().putAll(provider.getStereotypeStore()); + getTagValueStore().putAll(provider.getTagValueStore()); + } + } + } + + /** + * To define a stereotype. + * + * Place this annotation on the constant defining your stereotype. + * + * + * Example for stereotype named mystereotype which can be only put on a attribute : + * <pre> + * String STEREOTYPE_MYSTEREOTYPE = "mystereotype"; + * \@StereotypeDefinition(target = ObjectModelAttribute.class) + * </pre + * + * @author tchemit <chemit(a)codelutin.com> + * @see EugeneTagValues + * @since 2.3 + */ + @Target(ElementType.FIELD) + @Retention(RetentionPolicy.RUNTIME) + public @interface StereotypeDefinition { + + /** + * Define the types of object model api which can use this tag value. + * + * @return the array of target object model element which can accept the tag value. + */ + Class<?>[] target(); + } + + /** + * To define a tag value. + * + * Place this annotation on the constant defining your tag-value. + * + * Example for tag value named mytagvalut which can be only put on a attribute : + * <pre> + * String TAG_VALUE_MYTAGVALUE = "mytagvalue"; + * \@TagValueDefinition(target = ObjectModelAttribute.class) + * </pre + * + * @author tchemit <chemit(a)codelutin.com> + * @see EugeneTagValues + * @since 2.3 + */ + @Target(ElementType.FIELD) + @Retention(RetentionPolicy.RUNTIME) + public @interface TagValueDefinition { + + /** + * Define the types of object model api which can use this tag value. + * + * @return the array of target object model element which can accept the tag value. + */ + Class<?>[] target(); + } + + /** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ + public abstract static class ModelPropertiesProvider { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(ModelPropertiesProvider.class); + + protected Map<String, TagValueDefinition> tagValueStore; + + protected ModelPropertiesProvider() { + stereotypeStore = new TreeMap<String, StereotypeDefinition>(); + tagValueStore = new TreeMap<String, TagValueDefinition>(); + } + + protected abstract void init() throws Exception; + + protected void scanStereotypeClass(Class<?> holder) throws IllegalAccessException { + if (log.isInfoEnabled()) { + log.info("Will scan " + holder.getName() + " to search some stereotype definitions..."); + } + Field[] fields = holder.getDeclaredFields(); + for (Field field : fields) { + + StereotypeDefinition stereotypeDefinition = + field.getAnnotation(StereotypeDefinition.class); + + if (stereotypeDefinition != null) { + String fieldName = field.getName(); + String stereotypeName = (String) field.get(null); + if (log.isInfoEnabled()) { + log.info("Detected stereotype definition [" + fieldName + ":" + stereotypeName + "] : " + Arrays.toString(stereotypeDefinition.target())); + } + stereotypeStore.put(stereotypeName, stereotypeDefinition); + } + } + } + + protected void scanTagValueClass(Class<?> holder) throws IllegalAccessException { + if (log.isInfoEnabled()) { + log.info("Will scan " + holder.getName() + " to search some tag value definitions..."); + } + Field[] fields = holder.getDeclaredFields(); + for (Field field : fields) { + + TagValueDefinition tagValueDefinition = + field.getAnnotation(TagValueDefinition.class); + if (tagValueDefinition != null) { + String fieldName = field.getName(); + String tagValueName = (String) field.get(null); + if (log.isInfoEnabled()) { + log.info("Detected tag value definition [" + fieldName + ":" + tagValueName + "] : " + Arrays.toString(tagValueDefinition.target())); + } + tagValueStore.put(tagValueName, tagValueDefinition); + } + } + } + + protected Map<String, StereotypeDefinition> stereotypeStore; + + protected Map<String, StereotypeDefinition> getStereotypeStore() { + return stereotypeStore; + } + + protected Map<String, TagValueDefinition> getTagValueStore() { + return tagValueStore; + } + + public Class<?>[] getTagValueTarget(String tagValueName) { + TagValueDefinition definition = tagValueStore.get(tagValueName); + + Class<?>[] result = null; + if (definition != null) { + result = definition.target(); + } + return result; + } + + public Class<?>[] getStereotypeTarget(String tagValueName) { + + StereotypeDefinition definition = stereotypeStore.get(tagValueName); + + Class<?>[] result = null; + if (definition != null) { + result = definition.target(); + } + return result; + } + + } + +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/ModelPropertiesUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -49,6 +49,8 @@ protected long lastModifiedSource; protected boolean verbose; + + protected ClassLoader loader; public boolean isVerbose() { return verbose; @@ -58,6 +60,14 @@ this.verbose = verbose; } + public ClassLoader getLoader() { + return loader; + } + + public void setLoader(ClassLoader loader) { + this.loader = loader; + } + protected void setLastModifiedSource(File... files) { for (File file : files) { if (file.lastModified() > getLastModifiedSource()) { Deleted: trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -1,57 +0,0 @@ -/* - * #%L - * EUGene :: EUGene - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.eugene; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * To define a stereotype. - * - * Place this annotation on the constant defining your stereotype. - * - * - * Example for stereotype named mystereotype which can be only put on a attribute : - * <pre> - * String STEREOTYPE_MYSTEREOTYPE = "mystereotype"; - * \@StereotypeDefinition(target = ObjectModelAttribute.class) - * </pre - * - * @author tchemit <chemit(a)codelutin.com> - * @see EugeneTagValues - * @since 2.3 - */ -(a)Target(ElementType.FIELD) -(a)Retention(RetentionPolicy.RUNTIME) -public @interface StereotypeDefinition { - /** - * Define the types of object model api which can use this tag value. - * - * @return the array of target object model element which can accept the tag value. - */ - Class<?>[] target(); -} Deleted: trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -1,56 +0,0 @@ -/* - * #%L - * EUGene :: EUGene - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.eugene; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * To define a tag value. - * - * Place this annotation on the constant defining your tag-value. - * - * Example for tag value named mytagvalut which can be only put on a attribute : - * <pre> - * String TAG_VALUE_MYTAGVALUE = "mytagvalue"; - * \@TagValueDefinition(target = ObjectModelAttribute.class) - * </pre - * - * @author tchemit <chemit(a)codelutin.com> - * @see EugeneTagValues - * @since 2.3 - */ -(a)Target(ElementType.FIELD) -(a)Retention(RetentionPolicy.RUNTIME) -public @interface TagValueDefinition { - /** - * Define the types of object model api which can use this tag value. - * - * @return the array of target object model element which can accept the tag value. - */ - Class<?>[] target(); -} Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; +import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; @@ -199,6 +200,9 @@ public Properties loadModelProperties(File propFile, ObjectModel model) throws IOException { + // init ModelProperties store + ModelPropertiesUtil.initStore(getLoader()); + Properties prop = new RecursiveProperties(); // try { FileInputStream inStream = new FileInputStream(propFile); @@ -207,13 +211,6 @@ } finally { inStream.close(); } -// } catch (IOException eee) { -// -// if (log.isWarnEnabled()) { -// log.warn("Impossible de lire le fichier de propriete " -// + propFile, eee); -// } -// } // number of sucessfull imported tag values into model int numberImportedTagValues = 0; @@ -235,7 +232,7 @@ // model tag value - boolean loaded = loadModelTagvalue(model, key, value); + boolean loaded = loadModelTagValue(model, key, value); if (loaded) { @@ -278,7 +275,7 @@ return prop; } - public boolean loadModelTagvalue(ObjectModel model, String key, String value) { + public boolean loadModelTagValue(ObjectModel model, String key, String value) { Matcher matcher = modelTagValuePattern.matcher(key); if (!matcher.find()) { @@ -288,6 +285,17 @@ return false; } String tag = matcher.group(2); + + Class<?>[] targets = ModelPropertiesUtil.getTagValueTarget(tag); + if (targets == null) { + + // unknown tag value, can not use it + if (log.isWarnEnabled()) { + log.warn("Invalid model tag value [" + key + "] : the tagvalue is unkown."); + } + return false; + } + ObjectModelImpl modelImpl = (ObjectModelImpl) model; if (tag.equals(EugeneTagValues.TAG_VERSION)) { Added: trunk/eugene/src/main/resolver-cache/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider =================================================================== --- trunk/eugene/src/main/resolver-cache/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider (rev 0) +++ trunk/eugene/src/main/resolver-cache/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider 2010-11-28 23:16:57 UTC (rev 1015) @@ -0,0 +1 @@ +org.nuiton.eugene.ModelPropertiesUtil$EugeneModelPropertiesProvider \ No newline at end of file Property changes on: trunk/eugene/src/main/resolver-cache/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java (rev 0) +++ trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -0,0 +1,57 @@ +package org.nuiton.eugene; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClassifier; + +/** + * To test {@link ModelPropertiesUtil.EugeneModelPropertiesProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.3 + */ +public class EugeneModelPropertiesProviderTest { + + protected ModelPropertiesUtil.ModelPropertiesProvider provider; + + @BeforeClass + public void setUp() { + provider = new ModelPropertiesUtil.EugeneModelPropertiesProvider(); + } + + @Test + public void testGetTagValueTarget() throws Exception { + testTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX, ObjectModel.class, ObjectModelClassifier.class); + testTagValue(EugeneTagValues.TAG_I18N_PREFIX, ObjectModel.class, ObjectModelClassifier.class); + testTagValue(EugeneTagValues.TAG_NO_PCS, ObjectModel.class, ObjectModelClassifier.class); + testTagValue(EugeneTagValues.TAG_VERSION, ObjectModel.class); + } + + @Test + public void testGetStereotypeTarget() throws Exception { + + testStereotype(EugeneStereoTypes.STEREOTYPE_BEAN, ObjectModelClassifier.class); + testStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED, ObjectModelAttribute.class); + } + + @Test + public void testGetStore() throws Exception { + } + + protected void testStereotype(String name, Class<?>... expected) { + Class<?>[] classes = provider.getStereotypeTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } + + protected void testTagValue(String name, Class<?>... expected) { + Class<?>[] classes = provider.getTagValueTarget(name); + Assert.assertNotNull("Could not find target for " + name, classes); + Assert.assertEquals("Should have " + expected.length + " targets for " + name + " but had " + classes.length, classes.length, expected.length); + Assert.assertArrayEquals(expected, classes); + } +} Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/EugeneModelPropertiesProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-28 20:13:58 UTC (rev 1014) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-28 23:16:57 UTC (rev 1015) @@ -281,6 +281,7 @@ } getModelReader().setVerbose(configuration.isVerbose()); + getModelReader().setLoader(configuration.getClassLoader()); // read memory model from all files models Model model = getModelReader().read(filesToRead);

1 0

r1014 - in trunk: . ant-eugene-task eugene eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/models/object eugene/src/main/java/org/nuiton/eugene/models/object/xml eugene/src/test/java/org/nuiton/eugene maven-eugene-plugin
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 21:13:58 +0100 (Sun, 28 Nov 2010) New Revision: 1014 Url: http://nuiton.org/repositories/revision/eugene/1014 Log: Pass to version 2.3 Evolution #1117: Remove deprecated method isIndexed on ObjectModelAttribute Evolution #1113: Introduce a safe api to manager tag values and stereotypes Depreciate some old stuffs Added: trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/Template.java trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/ant-eugene-task/pom.xml 2010-11-28 20:13:58 UTC (rev 1014) @@ -36,7 +36,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/pom.xml 2010-11-28 20:13:58 UTC (rev 1014) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -56,14 +56,14 @@ * * It will replace each time the input model by the generated output model. * - * @since 2.2.1 + * @since 2.3 */ protected Class<? extends Transformer<M, M>>[] transformerTypes; /** * Templates to apply to the model. * - * @since 2.2.1, replace the old transformers field. + * @since 2.3, replace the old transformers field. */ protected Class<? extends Template<M>>[] templateTypes; @@ -72,7 +72,7 @@ /** * @param templateTypes templates to apply on model - * @deprecated since 2.2.1, prefer use the default constructor, the invoke + * @deprecated since 2.3, prefer use the default constructor, the invoke * setters {@link #setTemplateTypes(Class[])} and * {@link #setTransformerTypes(Class[])}. */ @@ -144,7 +144,7 @@ * @param model incoming model to transform * @param transformers list of transformers to apply to the model * @return the final transformed model - * @since 2.2.1 + * @since 2.3 */ protected M applyTransformers(M model, List<? extends Transformer<M, M>> transformers) { @@ -171,7 +171,7 @@ * @param templates templates to apply the incoming model * @param destDir the destination directory where to generate * @throws IOException if any IO errors while generating files - * @since 2.2.1 + * @since 2.3 */ protected void applyTemplates(M model, List<? extends Template<M>> templates, @@ -230,7 +230,7 @@ /** * @return the instances of templates to apply to the model. - * @deprecated since 2.2.1, prefer use the {@link #getInstances(Class[])} + * @deprecated since 2.3, prefer use the {@link #getInstances(Class[])} */ @Deprecated protected List<Template<M>> getTemplates() { @@ -273,7 +273,7 @@ /** * @return the template types to apply - * @deprecated since 2.2.1, use the method {@link #getTemplateTypes()} instead. + * @deprecated since 2.3, use the method {@link #getTemplateTypes()} instead. */ @Deprecated public Class<? extends Template<M>>[] getTransformers() { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -25,6 +25,9 @@ package org.nuiton.eugene; import org.nuiton.eugene.java.JavaBeanTransformer; +import org.nuiton.eugene.java.JavaGeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClassifier; /** * Defines all stereotypes managed by Eugene. @@ -33,14 +36,24 @@ * own stereotypes, to get a unique place where to find stereotypes. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.2.1 + * @since 2.3 */ public interface EugeneStereoTypes { /** - * Stereotype for JavaBean objects. + * Stereotype for JavaBean objects to place on a classifier. * * @see JavaBeanTransformer + * @see JavaGeneratorUtil#hasBeanStereotype(ObjectModelClassifier) */ + @StereotypeDefinition(target = ObjectModelClassifier.class) String STEREOTYPE_BEAN = "bean"; + + /** + * Stéréotype pour les attributs à indexer en base. + * + * @see GeneratorUtil#hasIndexedStereotype(ObjectModelAttribute) + */ + @StereotypeDefinition(target = ObjectModelAttribute.class) + String STEREOTYPE_INDEXED = "indexed"; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -25,41 +25,69 @@ package org.nuiton.eugene; import org.nuiton.eugene.java.JavaBeanTransformer; +import org.nuiton.eugene.java.JavaGeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelReader; /** * Defines all tag values managed by Eugene. - * + * * In another library using eugene, please extends this contract to put your * own tag values, to get a unique place where to find tag values. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.2.1 + * @since 2.3 */ public interface EugeneTagValues { /** - * tag value to add on constants enumeration (or other incoming dev) + * Tag value to add the version of the model from outside (says in the + * properties file associated to the model).. + * + * Actually, the eugene api does not use to modify the model. It is only + * used while reading the properties associated with a model and if found is + * directly set to the {@code version} field of the model. + * + * @see ObjectModelReader#loadModelTagvalue(ObjectModel, String, String) + * @since 2.3 + */ + @TagValueDefinition(target = {ObjectModel.class}) + String TAG_VERSION = "version"; + + /** + * Tag value to add on constants enumeration (or other incoming dev) * a prefix to constant to generate. + * + * You can globaly use it on the complete model or to a specific classifier. + * + * @see JavaGeneratorUtil#getConstantPrefixTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.3 */ + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_CONSTANT_PREFIX = "constantPrefix"; /** - * tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * Tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * + * You can globaly use it on the complete model or to a specific classifier. + * * @see JavaBeanTransformer + * @see JavaGeneratorUtil#getNoPCSTagValue(ObjectModel, ObjectModelClassifier) + * @since 2.3 */ - String TAG_NO_PCS= "noPCS"; + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) + String TAG_NO_PCS = "noPCS"; /** - * tag value to add the version of the model from outside (says in the - * properties file associated to the model).. + * Tag value to specify the i18n prefix to use whene generating i18n keys. + * + * You can globaly use it on the complete model or to a specific classifier. * - * @since 2.2.1 + * @see JavaGeneratorUtil#getI18nPrefixTagValue(ObjectModelElement, ObjectModel) + * @since 2.3 */ - String TAG_VERSION = "version"; - - /** - * Tag pour specfier if i18n must be generated. - * @since 2.2.1 - */ + @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}) String TAG_I18N_PREFIX = "i18n"; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -28,21 +28,33 @@ import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.models.Model; -import org.nuiton.eugene.models.object.*; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.util.StringUtil; import java.io.File; -import java.util.*; -import org.nuiton.util.StringUtil; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * GeneratorUtil. - * + * * Created: 25 aout 2003 * * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin * @version $Revision$ - * Mise à jour: $Date$ - * By : */ + * Mise à jour: $Date$ + * By : + */ public class GeneratorUtil { /** @@ -50,7 +62,7 @@ * eg : org.nuiton.eugene.models -> org.nuiton.eugene * eg : org -> org * warning : org.nuiton.eugene. -> org.nuiton.eugene - * + * * @param packageName package * @return parent package of given package */ @@ -66,8 +78,8 @@ /** * @param qualifiedName the fully qualified name to test * @return class name fr given fully qualified name (return given name if it is not fully qualified) - * eg : org.nuiton.eugene.models.ObjectClass -> ObjectClass - * eg : ObjectClass-> ObjectClass + * eg : org.nuiton.eugene.models.ObjectClass -> ObjectClass + * eg : ObjectClass-> ObjectClass */ public static String getClassNameFromQualifiedName(String qualifiedName) { String className = qualifiedName; @@ -79,7 +91,6 @@ } /** - * * @param qualifiedName the fully qualified name to test * @return the filename for the given qualified name. */ @@ -90,11 +101,10 @@ /** * return all classifiers belonging to the given package recursively. The Collection may be empty. * - * @param model the model where to look at + * @param model the model where to look at * @param packageName the package name to set for classifiers + * @return a Collection containing all classifiers belonging to the given package recursively. * @see ObjectModelClassifier - * - * @return a Collection containing all classifiers belonging to the given package recursively. */ public static Collection<ObjectModelClassifier> getClassifiers( ObjectModel model, String packageName) { @@ -119,16 +129,16 @@ /** * Retourne le type de l'attribut, c-a-d une List ou une collection * ou le type defini si la cardinalité n'est pas multiple - * - * @param attribute the attribute to test + * + * @param attribute the attribute to test * @param useGenerics {@code true} if the attribute use a generic type * @return attribute type */ public static String getAttributeType(ObjectModelParameter attribute, - boolean useGenerics) { + boolean useGenerics) { String result; if (attribute instanceof ObjectModelAttribute - && isNMultiplicity((ObjectModelAttribute) attribute)) { + && isNMultiplicity((ObjectModelAttribute) attribute)) { if (attribute.isOrdered()) { result = List.class.getName(); } else { @@ -145,6 +155,7 @@ /** * Indicates if the specified attribute has a primitive type (byte, boolean, ...) + * * @param attribute the attribute to test * @return true if the attribute has a primitive type */ @@ -155,13 +166,14 @@ } String type = attribute.getType(); return "byte".equals(type) || "short".equals(type) - || "int".equals(type) || "long".equals(type) - || "float".equals(type) || "double".equals(type) - || "char".equals(type) || "boolean".equals(type); + || "int".equals(type) || "long".equals(type) + || "float".equals(type) || "double".equals(type) + || "char".equals(type) || "boolean".equals(type); } /** * return an init value for the specified attribute + * * @param attribute the attribute to test * @return a String with the corresponding attribute init value */ @@ -269,8 +281,8 @@ /** * @param attribute the attribute to test * @return vrai si la cardinalite de l'attribut est superieur a 1, c-a-d - * si MaxMultiplicity == -1 ou > 1 - */ + * si MaxMultiplicity == -1 ou > 1 + */ public static boolean isNMultiplicity(ObjectModelAttribute attribute) { return isNMultiplicity(attribute.getMaxMultiplicity()); } @@ -285,11 +297,10 @@ */ public static boolean isOneMultiplicity(ObjectModelAttribute attribute) { return attribute != null && attribute.getMinMultiplicity() == 1 && - attribute.getMaxMultiplicity() == 1; + attribute.getMaxMultiplicity() == 1; } /** - * * @param word the word to decapitalize * @return the decapitalized word */ @@ -311,7 +322,7 @@ } public static String getParsingExpression(String type, - String attributeStringName) { + String attributeStringName) { if ("byte".equals(type)) { return "Byte.parseByte(" + attributeStringName + ")"; } @@ -346,7 +357,7 @@ } public static String getFormatingExpression(String type, - String attributeStringName) { + String attributeStringName) { if ("byte".equals(type)) { return "Byte.toString(" + attributeStringName + ")"; } @@ -383,20 +394,20 @@ /** * ToString contract for ObjectModelParameter with type and name. This * contract is used in - * {@link StringUtil#join(Iterable, org.nuiton.util.StringUtil.ToString, String, boolean)} + * {@link StringUtil#join(Iterable, org.nuiton.util.StringUtil.ToString, String, boolean)} */ static final StringUtil.ToString<ObjectModelParameter> OBJECT_MODEL_PARAMETER_TO_STRING_TYPE = - new StringUtil.ToString<ObjectModelParameter>() { + new StringUtil.ToString<ObjectModelParameter>() { - @Override - public String toString(ObjectModelParameter param) { - return new StringBuilder(getAttributeType(param)). + @Override + public String toString(ObjectModelParameter param) { + return new StringBuilder(getAttributeType(param)). append(' '). append(param.getName()). toString(); - } - }; + } + }; /** * ToString contract for ObjectModelParameter with name only. This contract @@ -405,28 +416,28 @@ */ static final StringUtil.ToString<ObjectModelParameter> OBJECT_MODEL_PARAMETER_TO_STRING_NAME = - new StringUtil.ToString<ObjectModelParameter>() { + new StringUtil.ToString<ObjectModelParameter>() { - @Override - public String toString(ObjectModelParameter param) { - return param.getName(); - } - }; + @Override + public String toString(ObjectModelParameter param) { + return param.getName(); + } + }; /** - * Used to return the {@code operation} parameters for its declaration : + * Used to return the {@code operation} parameters for its declaration : * type and name of each parameter will be join as a string separated by a * comma. Usefull for operation parameters declaration in templates writing. * * @param operation to treate * @return the string corresponding to the list of operation parameters - * for declaration syntax. + * for declaration syntax. */ public static String getOperationParametersListDeclaration( ObjectModelOperation operation) { String result = StringUtil.join( - operation.getParameters(), + operation.getParameters(), OBJECT_MODEL_PARAMETER_TO_STRING_TYPE, ", ", false); @@ -439,7 +450,7 @@ * * @param operation to treate * @return the string corresponding to the list of operation parameter - * names separated by a ', '. + * names separated by a ', '. */ public static String getOperationParametersListName( ObjectModelOperation operation) { @@ -473,6 +484,7 @@ /** * Renvoie si l'attribut passé en paramètre est premier lexicographiquement * par rapport à son attribut inverse (si celui ci existe). + * * @param attr L'attribut dont on veut savoir s'il est le premier * @return true, si l'attribut est premier (lexico ou pas de reverse attribute), false dans les autres cas */ @@ -492,7 +504,7 @@ * @return true s'il y a documentation, false sinon */ public static boolean hasDocumentation(ObjectModelElement element) { - return notEmpty(element.getDocumentation()); + return StringUtils.isNotEmpty(element.getDocumentation()); } /** @@ -500,7 +512,9 @@ * * @param s la chaine de caractères à tester * @return true si <code>s</code> n'est pas vide + * @deprecated since 2.3, use the method {@link StringUtils#isNotEmpty(String)} */ + @Deprecated public static boolean notEmpty(String s) { return s != null && !"".equals(s); } @@ -515,25 +529,29 @@ * @return la valeur du tagValue ou null */ public static String findTagValue(String tagName, - ObjectModelElement element, Model model) { + ObjectModelElement element, + Model model) { if (element == null) { if (model != null) { - if (notEmpty(model.getTagValue(tagName))) { - return model.getTagValue(tagName); + String value = model.getTagValue(tagName); + if (!StringUtils.isEmpty(value)) { + return value; } } return null; } - if (notEmpty(element.getTagValue(tagName))) { - return element.getTagValue(tagName); + String value = element.getTagValue(tagName); + if (!StringUtils.isEmpty(value)) { + return value; } //On va chercher sur l'element declarant return findTagValue(tagName, element.getDeclaringElement(), model); } public static boolean hasStereotype(ObjectModelElement element, - String stereotype) { - return element.hasStereotype(stereotype) || element.hasStereotype(stereotype.toLowerCase()); + String stereotype) { + return element.hasStereotype(stereotype) || + element.hasStereotype(stereotype.toLowerCase()); } /** @@ -541,21 +559,24 @@ * serialVersionUID. Exemple, returns "123456789L". * This id will change only if the type or the order of an attribute * changes. + * * @param clazz the class to use * @return the generated serialVersionUID */ public static String computeSerialVersionUID(ObjectModelClass clazz) { - String query = clazz.getQualifiedName() + "#"; - for (ObjectModelAttribute attr : clazz.getAttributes()) { - query += "-" + attr.getType(); - } - String result = query.hashCode() + "L"; - return result; + String query = clazz.getQualifiedName() + "#"; + for (ObjectModelAttribute attr : clazz.getAttributes()) { + query += "-" + attr.getType(); + } + String result = query.hashCode() + "L"; + return result; } /** - * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. + * Suppress packageName from a fullQualifiedName, even if it contains + * List, Map or other generics. + * * See JUnit test for matching expressions. * * @param str FullQualifiedName for an attribute type (for exemple) @@ -567,13 +588,15 @@ } /** - * Suppress packageName from a fullQualifiedName, even if it contains List, Map or other generics. + * Suppress packageName from a fullQualifiedName, even if it contains List, + * Map or other generics. + * * See JUnit test for matching expressions. * - * @param str FullQualifiedName for an attribute type (for exemple) + * @param str fullQualifiedName for an attribute type (for exemple) * @param removeGenericDefinition a flag to remove any generic definition at the beginning of the expression * @return the simple name associated to the str given - * @since 2.2.1 + * @since 2.3 */ public static String getSimpleName(String str, boolean removeGenericDefinition) { if (removeGenericDefinition) { @@ -606,7 +629,7 @@ * * @param str the string to parse * @return the string without any - * @since 2.2.1 + * @since 2.3 */ public static String removeGenericDefinition(String str) { @@ -646,7 +669,7 @@ /** * Parse a fully qualified generic java type, and extract each * imbricated types. - * + * * @param str string to parse * @return set of found types */ @@ -701,7 +724,7 @@ return buffer.toString(); } - /** + /** * Renvoie le nom de l'attribut de classe d'association en fonction des cas: * Si l'attribut porte le même nom que le type (extrémité inverse de * l'association), on lui ajoute le nom de la classe d'association @@ -721,4 +744,16 @@ return result; } + /** + * Check if the given attribute has the + * {@link EugeneStereoTypes#STEREOTYPE_INDEXED} stereotype. + * + * @param attribute attribute to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see EugeneStereoTypes#STEREOTYPE_INDEXED + */ + public static boolean hasIndexedStereotype(ObjectModelAttribute attribute) { + return attribute.hasStereotype(EugeneStereoTypes.STEREOTYPE_INDEXED); + } + } // GeneratorUtil Added: trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -0,0 +1,57 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * To define a stereotype. + * + * Place this annotation on the constant defining your stereotype. + * + * + * Example for stereotype named mystereotype which can be only put on a attribute : + * <pre> + * String STEREOTYPE_MYSTEREOTYPE = "mystereotype"; + * \@StereotypeDefinition(target = ObjectModelAttribute.class) + * </pre + * + * @author tchemit <chemit(a)codelutin.com> + * @see EugeneTagValues + * @since 2.3 + */ +(a)Target(ElementType.FIELD) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface StereotypeDefinition { + /** + * Define the types of object model api which can use this tag value. + * + * @return the array of target object model element which can accept the tag value. + */ + Class<?>[] target(); +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/StereotypeDefinition.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -0,0 +1,56 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * To define a tag value. + * + * Place this annotation on the constant defining your tag-value. + * + * Example for tag value named mytagvalut which can be only put on a attribute : + * <pre> + * String TAG_VALUE_MYTAGVALUE = "mytagvalue"; + * \@TagValueDefinition(target = ObjectModelAttribute.class) + * </pre + * + * @author tchemit <chemit(a)codelutin.com> + * @see EugeneTagValues + * @since 2.3 + */ +(a)Target(ElementType.FIELD) +(a)Retention(RetentionPolicy.RUNTIME) +public @interface TagValueDefinition { + /** + * Define the types of object model api which can use this tag value. + * + * @return the array of target object model element which can accept the tag value. + */ + Class<?>[] target(); +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/TagValueDefinition.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Template.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -37,7 +37,7 @@ import java.util.Properties; /** - * Generator. TODO javadoc + * Template. TODO javadoc * * Created: 5 août 2004 * @@ -140,17 +140,6 @@ } } - /** - * Set the properties configuration. - * - * @param p the configuration - * @deprecated since 2.0.2, prefer use the {@link TemplateConfiguration} api. - */ - @Deprecated - public void setProperties(Properties p) { - getConfiguration().getProperties().putAll(p); - } - protected List<String> getGeneratedPackages() { if (generatedPackages == null) { generatedPackages = new ArrayList<String>(); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -133,11 +133,6 @@ */ protected abstract O initOutputModel(); - @Override - public void setProperties(Properties outputProperties) { - this.outputProperties = outputProperties; - } - /** * Output properties for output generator. Initially set from build configuration. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -27,7 +27,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -85,14 +84,14 @@ log.debug("will generate " + output.getQualifiedName()); } - String i18nPrefix = JavaGeneratorUtil.getI18nPrefix(input, model); + String i18nPrefix = JavaGeneratorUtil.getI18nPrefixTagValue(input, model); if (!StringUtils.isEmpty(i18nPrefix)) { generateI18nBlock(input, output, i18nPrefix); } ObjectModelClass ouputImpl = generateImpl(input, output); - String noPCSTagValue = input.getTagValue(EugeneTagValues.TAG_NO_PCS); + String noPCSTagValue = JavaGeneratorUtil.getNoPCSTagValue(model, input); boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || !"true".equals(noPCSTagValue.trim()); @@ -560,7 +559,7 @@ } protected boolean canGenerate(ObjectModelClass input) { - return input.hasStereotype(EugeneStereoTypes.STEREOTYPE_BEAN); + return JavaGeneratorUtil.hasBeanStereotype(input); } protected void createPropertyChangeSupport(ObjectModelClass output) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -24,6 +24,7 @@ */ package org.nuiton.eugene.java; +import org.nuiton.eugene.EugeneStereoTypes; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModel; @@ -47,9 +48,10 @@ /** * dependency to add constants in interfaces via an enumeration. - * + * * The literals of enumeration will be the value, and constant names will * be generated by transformers. + * * @since 2.0.2 */ public static final String DEPENDENCIES_CONSTANTS = "constants"; @@ -58,18 +60,18 @@ * Duplicates in the {@code target} classifier the given {@code operations} * using a {@code transformer} to modify model. * - * @param transformer the transformer to use - * @param operations operations to duplicate - * @param target where to duplicate operations - * @param useVisibility flag to use operation visibilty to compute his - * modifiers - * @param extraModifiers scopes to apply to all operations + * @param transformer the transformer to use + * @param operations operations to duplicate + * @param target where to duplicate operations + * @param useVisibility flag to use operation visibilty to compute his + * modifiers + * @param extraModifiers scopes to apply to all operations */ public static void cloneOperations(ObjectModelTransformerToJava transformer, - Iterable<ObjectModelOperation> operations, - ObjectModelClassifier target, - boolean useVisibility, - ObjectModelModifier... extraModifiers) { + Iterable<ObjectModelOperation> operations, + ObjectModelClassifier target, + boolean useVisibility, + ObjectModelModifier... extraModifiers) { for (ObjectModelOperation op : operations) { ObjectModelOperation resultOp; @@ -113,16 +115,63 @@ } /** + * Check if the given classifier has the + * {@link EugeneStereoTypes#STEREOTYPE_BEAN} stereotype. + * + * @param classifier classifier to test + * @return {@code true} if stereotype was found, {@code false otherwise} + * @see EugeneStereoTypes#STEREOTYPE_BEAN + */ + public static boolean hasBeanStereotype(ObjectModelClassifier classifier) { + return classifier.hasStereotype(EugeneStereoTypes.STEREOTYPE_BEAN); + } + + /** * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur * le model. * * @param element l'élément à tester * @param model le modele utilisé * @return le prefix i18n ou <code>null</code> si non spécifié - * @since 2.2.1 + * @since 2.3 */ - public static String getI18nPrefix(ObjectModelElement element, - ObjectModel model) { + public static String getI18nPrefixTagValue(ObjectModelElement element, + ObjectModel model) { return findTagValue(EugeneTagValues.TAG_I18N_PREFIX, element, model); } + + /** + * Obtain the value of the {@link EugeneTagValues#TAG_NO_PCS} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see EugeneTagValues#TAG_NO_PCS + * @since 2.3 + */ + public static String getNoPCSTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(EugeneTagValues.TAG_NO_PCS, classifier, model); + return value; + } + + /** + * Obtain the value of the {@link EugeneTagValues#TAG_CONSTANT_PREFIX} + * tag value on the given model or classifier. + * + * It will first look on the model, and then in the given classifier. + * + * @param model model to seek + * @param classifier classifier to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see EugeneTagValues#TAG_CONSTANT_PREFIX + * @since 2.3 + */ + public static String getConstantPrefixTagValue(ObjectModel model, + ObjectModelClassifier classifier) { + String value = findTagValue(EugeneTagValues.TAG_CONSTANT_PREFIX, classifier, model); + return value; + } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -194,10 +194,9 @@ String defaultPrefix) { // look if there is a constant_prefix tag value - String prefix = JavaGeneratorUtil.findTagValue( - EugeneTagValues.TAG_CONSTANT_PREFIX, - input, - getModel() + String prefix = JavaGeneratorUtil.getConstantPrefixTagValue( + getModel(), + input ); if (StringUtils.isEmpty(prefix)) { @@ -375,7 +374,7 @@ * * @param attribute the attribute on which the navigable flag will be setted * @param navigable the navigable flag to set - * @since 2.2.1 + * @since 2.3 */ public void setNavigable(ObjectModelAttribute attribute, boolean navigable) { builder.setNavigable(attribute, navigable); @@ -538,7 +537,7 @@ * * @param source the source element * @param destination the destination element - * @since 2.2.1 + * @since 2.3 */ protected void cloneTagValues(ObjectModelElement source, ObjectModelElement destination) { @@ -552,7 +551,7 @@ * * @param source * @param destination - * @since 2.2.1 + * @since 2.3 */ protected void cloneStereotypes(ObjectModelClassifier source, ObjectModelClassifier destination) { @@ -576,7 +575,7 @@ * @param destination where to clone the given source one * @param copyDocumentation flag to add documentation if some found in model * @since 2.1.2 - * @deprecated since 2.2.1, prefer use the {@link #cloneClass(ObjectModelClass, boolean)} method + * @deprecated since 2.3, prefer use the {@link #cloneClass(ObjectModelClass, boolean)} method */ @Deprecated protected void copyClassifier(ObjectModelClassifier source, @@ -598,7 +597,7 @@ * @param source the classifier to clone from the source model * @param destination where to clone the given source one * @param copyDocumentation flag to add documentation if some found in model - * @since 2.2.1 + * @since 2.3 */ protected void cloneClassifier(ObjectModelClassifier source, ObjectModelClassifier destination, Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -124,11 +124,7 @@ */ boolean isFinal(); /** - * @return {@code true} if this attribute is navigable + * @return {@code true} if this attribute is navigable. */ boolean isNavigable(); - /** - * @return {@code true} if this attribute is isIndexed - */ - boolean isIndexed(); } //ObjectModelAttribute Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -692,7 +692,7 @@ * * @param attribute where the navigable flag will be setted * @param navigable navigable flag value to set - * @since 2.2.1 + * @since 2.3 */ public void setNavigable(ObjectModelAttribute attribute, boolean navigable) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -120,17 +120,6 @@ */ boolean hasTagValue(String tagValue); -// /** -// * Adds the given {@code value} associated to the {@code tagValue}. -// * -// * Note: If a previous tag value was definied, then it will be replaced. -// * -// * @param tagValue the name of the tag value -// * @param value the value to associate -// * @since 2.1.2 -// */ -// void addTagValue(String tagValue, String value); - /** * Return if this element has static declaration, only valid when * getDeclaringElement is classifier. Not possible for the moment Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -26,18 +26,18 @@ package org.nuiton.eugene.models.object; /** -* Abstraction for the parameter node of object model trees. -* This object presents all information concerning the given parameter. -* -* Created: 14 janv. 2004 -* -* @author Cédric Pineau <pineau(a)codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Last update : $Date$ -* by : $Author$ -*/ + * Abstraction for the parameter node of object model trees. + * This object presents all information concerning the given parameter. + * + * Created: 14 janv. 2004 + * + * @author Cédric Pineau <pineau(a)codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Last update : $Date$ + * by : $Author$ + */ public interface ObjectModelParameter extends ObjectModelElement { /** Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -101,7 +101,7 @@ * Pattern to define tag values authorized at model level in the model * properties file. * - * @since 2.2.1 + * @since 2.3 */ protected Pattern modelTagValuePattern = Pattern.compile( "^model\\.(?:(tagvalue|tagValue)?)\\.((?:.+))$"); Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -26,6 +26,7 @@ package org.nuiton.eugene.models.object.xml; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -51,7 +52,7 @@ protected String associationClassName; protected boolean isStatic; protected boolean isFinal; - protected boolean isNavigable = true; + protected boolean navigable = true; public ObjectModelAttributeImpl() { } @@ -88,8 +89,8 @@ this.isStatic = isStatic; } - public void setNavigable(boolean isNavigable) { - this.isNavigable = isNavigable; + public void setNavigable(boolean navigable) { + this.navigable = navigable; } /** @@ -183,11 +184,6 @@ return name; } - /* - * (non-Javadoc) - * - * @see org.nuiton.eugene.models.object.ObjectModelAttribute#getReverseMaxMultiplicity() - */ @Override public int getReverseMaxMultiplicity() { return reverseMaxMultiplicity; @@ -237,28 +233,17 @@ return isFinal; } - /* - * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isNavigable() - */ @Override public boolean isNavigable() { - return isNavigable; + return navigable; } - /* - * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isOrdered() + /** + * FIXME tchemit 2010-11-28 Why the ordered flag may be indexed ? This is two distinct concepts ? */ @Override public boolean isOrdered() { - return isIndexed() || super.isOrdered(); + return JavaGeneratorUtil.hasIndexedStereotype(this) || super.isOrdered(); } - /* - * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isIndexed() - */ - @Deprecated - @Override - public boolean isIndexed() { - return hasStereotype("indexed"); - } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -43,10 +43,17 @@ protected String type; protected int minMultiplicity = 1; protected int maxMultiplicity = 1; - protected String ordering = "unspecified"; - protected boolean isUnique = true; +// protected String ordering = "unspecified"; + + /** + * FIXME tchemit 2010-11-28 Why the default value is true ? + */ + protected boolean unique = true; + protected boolean ordered; protected String defaultValue; + public static final String PROPERTY_ORDERED = "ordered"; + public ObjectModelParameterImpl() { } @@ -62,12 +69,17 @@ this.maxMultiplicity = maxMultiplicity; } + /** + * + * @param ordering + */ public void setOrdering(String ordering) { - this.ordering = ordering; + setOrdered(PROPERTY_ORDERED.equals(ordering)); +// this.ordering = ordering; } - public void setUnique(boolean isUnique) { - this.isUnique = isUnique; + public void setUnique(boolean unique) { + this.unique = unique; } public void setDefaultValue(String defaultValue) { @@ -96,12 +108,17 @@ @Override public boolean isOrdered() { - return "ordered".equals(ordering); + return ordered; +// return "ordered".equals(ordering); } + public void setOrdered(boolean ordered) { + this.ordered = ordered; + } + @Override public boolean isUnique() { - return isUnique; + return unique; } @Override Modified: trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java 2010-11-28 20:13:58 UTC (rev 1014) @@ -34,7 +34,7 @@ * Helper for all eugene tests. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.2.1 + * @since 2.3 */ @Ignore // this is not a test :) Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/maven-eugene-plugin/pom.xml 2010-11-28 20:13:58 UTC (rev 1014) @@ -36,7 +36,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> @@ -219,6 +219,7 @@ </property> </activation> <build> + <defaultGoal>integration-test</defaultGoal> <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> @@ -226,12 +227,13 @@ <pomIncludes> <pomInclude>evol-879/zargo/pom.xml</pomInclude> <pomInclude>evol-879/xmi/pom.xml</pomInclude> - <pomInclude>evol-879/model/pom.xml</pomInclude> <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> <pomInclude>smart-generate/only-zargo/pom.xml</pomInclude> <pomInclude>smart-generate/only-zargo-xmi/pom.xml</pomInclude> <pomInclude>smart-generate/all/pom.xml</pomInclude> <pomInclude>smart-generate/generators/pom.xml</pomInclude> +  +  </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-28 12:33:19 UTC (rev 1013) +++ trunk/pom.xml 2010-11-28 20:13:58 UTC (rev 1014) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> <modules> <module>eugene</module>

1 0

r1013 - in trunk: eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/writer eugene/src/test/java/org/nuiton/eugene/java maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 13:33:19 +0100 (Sun, 28 Nov 2010) New Revision: 1013 Url: http://nuiton.org/repositories/revision/eugene/1013 Log: Evolution #1116: Remove deprecated in ChainedFileWriter api from 2.1.3 remove redundant initializer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -73,7 +73,7 @@ for (ObjectModelOperation op : operations) { ObjectModelOperation resultOp; - ObjectModelModifier[] modifiers = null; + ObjectModelModifier[] modifiers; if (useVisibility) { // compute visibility modifer Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -27,14 +27,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.StringUtil; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -114,23 +112,6 @@ Collections.unmodifiableMap(authorizedPropertyDescriptions); } - /** - * Generates some files for a given input, output and include pattern. - * - * @param configuration the shared configuration for all writers - * @param outputDir where to generate files - * @param inputDirectory where to pick up files - * @param includePattern pattern of files to include - * @throws IOException for any IO pb. - * @deprecated since 2.1.3, prefer use {@link #generate(ChainedFileWriterConfiguration, ChainedFileWriterData} - */ - @Deprecated - protected abstract void generate( - ChainedFileWriterConfiguration configuration, - File outputDir, - File inputDirectory, - String includePattern) throws IOException; - @Override public Map<String, String> getAuthorizedPropertyDescriptions() { return authorizedPropertyDescriptions; @@ -181,98 +162,7 @@ } } - @Deprecated @Override - public void generate(ChainedFileWriterConfiguration configuration) - throws IOException { - - long t0 = System.nanoTime(); - - initWriter(configuration); - - try { - File outputDir = getOutputDirectory( - configuration.getOutputDirectory(), - configuration.isTestPhase() - ); - - if (!outputDir.exists()) { - if (log.isDebugEnabled()) { - log.debug("[" + getInputProtocol() + - "] Create output directory " + outputDir); - } - boolean b = outputDir.mkdirs(); - if (!b) { - throw new IOException("Could not creat directory " + - outputDir); - } - } - - Map<File, List<String>> mergeEntries = mergeEntries(entries); - - generateEntries(configuration, outputDir, mergeEntries); - - } finally { - clear(); - } - } - - /** - * - * @param entries - * @return - * @deprecated since 2.1.3, will not be replaced. - */ - @Deprecated - protected Map<File, List<String>> mergeEntries(List<ChainedFileWriterEntry> entries) { - // merge entries if required - Map<File, List<String>> merge = new HashMap<File, List<String>>(); - - for (ChainedFileWriterEntry e : entries) { - File input = e.getInputDirectory(); - List<String> includes = merge.get(input); - if (includes == null) { - includes = new ArrayList<String>(); - merge.put(input, includes); - } - includes.add(e.getIncludePattern()); - } - return merge; - } - - - /** - * - * @param configuration - * @param outputDir - * @param entries - * @throws IOException - * @deprecated since 2.1.3, will not be replaced. - */ - @Deprecated - protected void generateEntries(ChainedFileWriterConfiguration configuration, - File outputDir, - Map<File, List<String>> entries) throws IOException { - - // apply from merge entries - for (Map.Entry<File, List<String>> e : entries.entrySet()) { - File input = e.getKey(); - List<String> includes = e.getValue(); - String includePattern = StringUtil.join(includes, ",", true); - if (log.isDebugEnabled()) { - log.debug("[" + getInputProtocol() + - "] Will generate entry " + input - + " : " + includePattern); - } - generate(configuration, - outputDir, - input, - includePattern - ); - } - } - - @Override public String getInputProtocol(String modelType) { // input protocol is the same for all model return acceptModel(modelType) ? getInputProtocol() : null; @@ -329,12 +219,19 @@ protected void initWriter(ChainedFileWriterConfiguration configuration) { Map<String, Object> map = configuration.getProperties(); + boolean verbose = configuration.isVerbose(); for (String key : getAuthorizedPropertyNames()) { //TODO-TC-20091217, should prefix keys by the inputProtocol to //TODO-TC-20091217 avoid collisions ? + if (map.containsKey(key)) { // keep this property - properties.put(key, map.get(key)); + Object value = map.get(key); + if (verbose) { + log.info("[" + getClass().getName() + "] add configuration property " + key + " = " + value); + } + properties.put(key, value); + } } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -130,18 +130,6 @@ File getExtractDirectory(File outputBasedir, boolean testPhase); /** - * Launch the generation for this writer. - * - * @param configuration the share configuration of all writers. - * @throws IOException if any io pb. - * @deprecated since 2.1.3, use now the class-path capable - * {@link #generate(ChainedFileWriterConfiguration, ChainedFileWriterData)} - */ - @Deprecated - void generate(ChainedFileWriterConfiguration configuration) - throws IOException; - - /** * Launch the generation for this writer with all pre-computed data to * treate and resources to copy. * Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -301,12 +301,12 @@ ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); - ObjectModelOperation result = builder.addOperation(classifier, - "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); + builder.addOperation(classifier, + "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); - result = builder.addOperation(classifier, - "addPropertyChangeListener", null, - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + builder.addOperation(classifier, + "addPropertyChangeListener", null, + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); // Check imports ImportsManagerExtension ext = builder.getModel().getExtension( Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -32,13 +32,10 @@ import org.nuiton.eugene.TemplateConfiguration; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; -import org.nuiton.plugin.PluginHelper; -import org.nuiton.plugin.PluginIOContext; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -314,86 +311,4 @@ } } - @Override - @Deprecated - public void generate(ChainedFileWriterConfiguration configuration, - File outputDir, - File inputDirectory, - String includePattern) throws IOException { - - PluginIOContext ioContext = new PluginIOContext(); - ioContext.setInput(inputDirectory); - ioContext.setOutput(outputDir); - - // obtain files - - List<File> modelFiles = new ArrayList<File>(); - String[] includePatterns = includePattern.split(","); - - if (configuration.isVerbose()) { - getLog().info("Generating from " + inputDirectory + " : " + - includePattern); - } - - if (configuration.isVerbose()) { - getLog().info("Will use classLoader " + configuration.getClassLoader()); - } - - for (File srcDirGen : ioContext.getInputs()) { - - if (configuration.isVerbose()) { - getLog().info("Search for " + Arrays.toString(includePatterns) - + " in " + srcDirGen.getAbsolutePath()); - } - List<File> currentFiles = PluginHelper.getIncludedFiles( - srcDirGen, includePatterns, null); - - if (currentFiles.isEmpty()) { - getLog().info("No model to use."); - return; - } - - if (currentFiles.size() == 1) { - getLog().info("Using one model :"); - } else { - getLog().info("Using " + currentFiles.size() + " models :"); - } - for (File currentFile : currentFiles) { - getLog().info(" " + currentFile.getAbsolutePath()); - } - modelFiles.addAll(currentFiles); - } - - // read the model - - File[] filesToRead = modelFiles.toArray(new File[modelFiles.size()]); - - Model model = getModelReader().read(filesToRead); - - // get the last modified source timestamp from reader - long lastModifiedSource = getModelReader().getLastModifiedSource(); - - // apply all templates to the model - - for (Template<Model> template : getTemplatesList()) { - getLog().info("Apply generator " + template.getClass().getSimpleName()); - - // set the lastModified source property - template.setProperty(Template.PROP_LAST_MODIFIED_SOURCE, lastModifiedSource); - - template.setProperty(Template.PROP_WRITER_REPORT, getWriterReport()); - - if (configuration.isVerbose()) { - getLog().info(" overwrite = " + template.isOverwrite()); - getLog().info(" encoding = " + template.getEncoding()); - getLog().info(" lastModifiedSource = " + template.getLastModifiedSource()); - getLog().info(" exclude = " + template.getExcludeTemplates()); - } - - // apply template - template.applyTemplate(model, ioContext.getOutput()); - } - - } - } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -30,7 +30,6 @@ import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; import org.nuiton.eugene.writer.WriterReport; import org.nuiton.plugin.PluginHelper; -import org.nuiton.plugin.PluginIOContext; import org.nuiton.util.FasterCachedResourceResolver; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; @@ -210,10 +209,6 @@ getStyleSheet(configuration.getModelType(), file); URL xsl = Resource.getURL(styleSheet); - //TC-20090820 : using recursive for xmi -// File result = new File(destDirModel, FileUtil.basename(file, -// acceptedSuffixes).concat(".").concat(getExtension())); - String newExtension = configuration.getModelType(); // get the mirror file in the ouput root directory @@ -225,16 +220,6 @@ // change the extension name to the modeltype File result = FileUtil.changeExtension(mirrorFile, newExtension); -// String filename = FileUtil.basename(file, extension). -// concat(".").concat(configuration.getModelType()); -// String relatifPath = file.getParentFile().getAbsolutePath(). -// substring(inputDirectory.getAbsolutePath().length()); -// File dstDir = outputDir; -// if (!relatifPath.isEmpty()) { -// dstDir = new File(dstDir, relatifPath); -// PluginHelper.createDirectoryIfNecessary(dstDir); -// } -// File result = new File(dstDir, filename); if (!configuration.isOverwrite() && file.lastModified() < result.lastModified()) { @@ -283,127 +268,6 @@ } } - @Override - @Deprecated - public void generate(ChainedFileWriterConfiguration configuration, - File outputDir, - File inputDirectory, - String includePattern) throws IOException { - - getLog().info("Processing XSL tranformation on " + - inputDirectory + " for " + includePattern); - - if (configuration.isVerbose()) { - getLog().info(" with fullPackagePath : " + getFullPackagePath()); - getLog().info(" with resolver : " + getResolver()); - } - // recuperation des fichiers a traiter - List<File> files = PluginHelper.getIncludedFiles( - inputDirectory, new String[]{includePattern}, null); - - // lancement des traitements xsl sur les fichiers trouvés - // dans le repertoire - actionXsl(configuration, - outputDir, - inputDirectory, - files - ); - - if (configuration.isVerbose()) { - getLog().info("Copy resources files."); - } - - PluginIOContext ioContext = new PluginIOContext(); - ioContext.setInput(inputDirectory); - ioContext.setOutput(outputDir); - PluginHelper.copyFiles(ioContext, - null, - new String[]{includePattern}, - configuration.isOverwrite() - ); - } - - @Deprecated - protected void actionXsl(ChainedFileWriterConfiguration configuration, - File outputDir, - File dir, - List<File> files) throws IOException { - - for (File file : files) { - try { - if (getLog().isDebugEnabled()) { - getLog().debug("treate file : " + file); - } - // Prepare resolver, stylesheet - URIResolver fileResolver = getUriResolver(configuration, file); - String styleSheet = - getStyleSheet(configuration.getModelType(), file); - URL xsl = Resource.getURL(styleSheet); - - //TC-20090820 : using recursive for xmi -// File result = new File(destDirModel, FileUtil.basename(file, -// acceptedSuffixes).concat(".").concat(getExtension())); - - String extension = "." + FileUtil.extension(file); - String filename = FileUtil.basename(file, extension). - concat(".").concat(configuration.getModelType()); - String relatifPath = file.getParentFile().getAbsolutePath(). - substring(dir.getAbsolutePath().length()); - File dstDir = outputDir; - if (!relatifPath.isEmpty()) { - dstDir = new File(dstDir, relatifPath); - PluginHelper.createDirectoryIfNecessary(dstDir); - } - File result = new File(dstDir, filename); - if (!configuration.isOverwrite() && file.lastModified() < result.lastModified()) { - - if (configuration.isVerbose()) { - getLog().info("Will not generate " + result + - " (up-to-date)."); - } - continue; - } - - WriterReport writerReport = getWriterReport(); - if (writerReport != null) { - - writerReport.addFile( - getClass().getName(), - result, - true - ); - } - - // Create the xsl transformer and set parameters - Transformer transformer = getTransformerFactory(). - newTransformer(new StreamSource(xsl.openStream())); - - transformer.setParameter(PROP_FULL_PACKAGE_PATH, - getFullPackagePath() - ); - transformer.setParameter(PROP_EXTRACTED_PACKAGES, - getExtractedPackages() - ); - - transformer.setURIResolver(fileResolver); - FileOutputStream output = new FileOutputStream(result); - try { - transformer.transform( - new StreamSource(file), - new StreamResult(output) - ); - } finally { - output.close(); - } - - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new IOException(e.getMessage(), e); - } - } - } - protected URIResolver getUriResolver( ChainedFileWriterConfiguration configuration, File model) { URIResolver result = null; Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java 2010-11-28 11:24:27 UTC (rev 1012) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java 2010-11-28 12:33:19 UTC (rev 1013) @@ -30,7 +30,6 @@ import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; import org.nuiton.eugene.writer.WriterReport; import org.nuiton.plugin.PluginHelper; -import org.nuiton.plugin.PluginIOContext; import org.nuiton.util.FileUtil; import java.io.File; @@ -124,7 +123,6 @@ ); expandFile(file, mirrorDirectory, XMI_FILE_FILTER, configuration); -// expandFile(file, outputDirectory, XMI_FILE_FILTER, configuration); // copy resources associated with the file copyResources(configuration, @@ -137,67 +135,6 @@ } } - @Override - @Deprecated - public void generate(ChainedFileWriterConfiguration configuration, - File outputDir, - File inputDirectory, - String includePattern) throws IOException { - - boolean overwrite = configuration.isOverwrite(); - - PluginIOContext ioContext = new PluginIOContext(); - ioContext.setInput(inputDirectory); - ioContext.setOutput(outputDir); - - getLog().info("Expanding xmi from " + inputDirectory + " : " + - includePattern); - - expandFiles(ioContext, - new String[]{includePattern}, - null, - XMI_FILE_FILTER, - configuration - ); - - getLog().info("Copying resources from " + inputDirectory + " : " + - includePattern); - - PluginHelper.copyFiles(ioContext, - null, - new String[]{includePattern}, - overwrite - ); - } - - @Deprecated - public void expandFiles(PluginIOContext p, - String[] includes, - String[] excludes, - String[] zipIncludes, - ChainedFileWriterConfiguration configuration) throws IOException { - - DirectoryScanner ds = new DirectoryScanner(); - - for (File input : p.getInputs()) { - ds.setBasedir(input); - if (includes != null) { - ds.setIncludes(includes); - } - if (excludes != null) { - - ds.setExcludes(excludes); - } - ds.addDefaultExcludes(); - ds.scan(); - for (String file : ds.getIncludedFiles()) { - File in = new File(input, file); - File out = new File(p.getOutput(), file).getParentFile(); - expandFile(in, out, zipIncludes, configuration); - } - } - } - public void expandFile(File src, File dst, String[] includes, @@ -209,10 +146,10 @@ String name = nextElement.getName(); for (String include : includes) { if (DirectoryScanner.match(include, name)) { -// if (configuration.isVerbose()) { + if (configuration.isVerbose()) { getLog().info("matching name : " + name + " with pattern " + include); -// } + } File dstFile = new File(dst, name); if (configuration.isOverwrite() || !dstFile.exists() ||

1 0

28 Nov '10

Author: tchemit Date: 2010-11-28 12:24:27 +0100 (Sun, 28 Nov 2010) New Revision: 1012 Url: http://nuiton.org/repositories/revision/eugene/1012 Log: fix svn-keywords AGAIN... Modified: trunk/LICENSE.txt trunk/README.txt trunk/ant-eugene-task/LICENSE.txt trunk/ant-eugene-task/README.txt trunk/ant-eugene-task/changelog.txt trunk/ant-eugene-task/pom.xml trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java trunk/ant-eugene-task/src/site/fr/rst/index.rst trunk/ant-eugene-task/src/site/resources/build.xml trunk/ant-eugene-task/src/site/rst/index.rst trunk/ant-eugene-task/src/site/site_en.xml trunk/ant-eugene-task/src/site/site_fr.xml trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/BasicObjectModelGenerator.java trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java trunk/ant-eugene-task/src/test/resources/log4j.properties trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties trunk/ant-eugene-task/src/test/resources/uml/Acceleo.Business.profile.uml trunk/ant-eugene-task/src/test/resources/xmi/1.2/dependency.xmi trunk/ant-eugene-task/src/test/resources/xmi/1.2/enumeration.xmi trunk/ant-eugene-task/src/test/resources/xmi/1.2/isis-fish.xmi trunk/ant-eugene-task/src/test/resources/xmi/1.2/topiatest.xmi trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.umldi trunk/ant-eugene-task/src/test/resources/xmi/2.1/cmsCore.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/cmsLink.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/http-storage-api/src/main/uml/conception.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.umldi trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.umldi trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.uml trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.umldi trunk/ant-eugene-task/src/test/resources/xmi/2.1/vpod.uml trunk/changelog.txt trunk/eugene/LICENSE.txt trunk/eugene/README.txt trunk/eugene/TODO trunk/eugene/changelog.txt trunk/eugene/doc/1-javamodel/Etude_JavaModel_EUGene.pdf trunk/eugene/doc/1-javamodel/Metamodel_Java_04-02-02.pdf trunk/eugene/doc/1-javamodel/sources/JavaModel.png trunk/eugene/doc/1-javamodel/sources/ObjectModel.png trunk/eugene/doc/1-javamodel/sources/ObjectModel_Interfaces.png trunk/eugene/doc/1-javamodel/sources/Todo.rst trunk/eugene/doc/1-javamodel/sources/description_metamodel_java trunk/eugene/doc/1-javamodel/sources/eugen_java.zargo trunk/eugene/doc/1-javamodel/sources/eugene_objectmodel.zargo trunk/eugene/doc/2-javabuilder/JavaBuilder.pdf trunk/eugene/doc/2-javabuilder/sources.tar.gz trunk/eugene/doc/2-javabuilder/sources/JavaBuilder.png trunk/eugene/doc/2-javabuilder/sources/ObjectModel.png trunk/eugene/doc/2-javabuilder/sources/ObjectModelBuilderHelper.png trunk/eugene/doc/2-javabuilder/sources/description_javabuilder trunk/eugene/doc/2-javabuilder/sources/eugene_javabuilder.zargo trunk/eugene/doc/3-v2.0/eugene2.0.pdf trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene1.0.1_Generation.png trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene2.0_Generation.png trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene2.0_GenerationJava.png trunk/eugene/doc/3-v2.0/sources/DiagClasses_Generators.png trunk/eugene/doc/3-v2.0/sources/EUGene-generate.vpp trunk/eugene/doc/3-v2.0/sources/eugene2.0 trunk/eugene/doc/3-v2.0/sources/eugene_v2.0.zargo trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/Template.java trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/package-info.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/eugene/src/main/java/org/nuiton/eugene/writer/package-info.java trunk/eugene/src/main/resolver-cache/META-INF/cache/argouml.org/profiles/um… trunk/eugene/src/main/resolver-cache/META-INF/cache/argouml.org/profiles/um… trunk/eugene/src/main/resources/dtd/objectmodel.dtd trunk/eugene/src/main/resources/dtd/statemodel.dtd trunk/eugene/src/main/resources/xmi/default-java.xmi trunk/eugene/src/main/resources/xmi/default-uml14.xmi trunk/eugene/src/main/resources/xsd/objectmodel.xsd trunk/eugene/src/main/resources/xsd/todo.txt trunk/eugene/src/main/xsl/poseidon2argouml.xsl trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl trunk/eugene/src/site/fr/rst/DevUIDoc.rst trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst trunk/eugene/src/site/fr/rst/Todo.rst trunk/eugene/src/site/fr/rst/index.rst trunk/eugene/src/site/fr/rst/plugineclipse.rst trunk/eugene/src/site/resources/images/StateModel.png trunk/eugene/src/site/resources/images/plugin_choix.png trunk/eugene/src/site/resources/images/plugin_menu.png trunk/eugene/src/site/resources/images/plugin_newdepot.png trunk/eugene/src/site/resources/images/plugin_typeinstall.png trunk/eugene/src/site/resources/images/plugin_utilisation_editeur.png trunk/eugene/src/site/resources/models/buix.guix trunk/eugene/src/site/resources/models/exemple.topiaModel trunk/eugene/src/site/resources/xmi/ObjectModel.zuml trunk/eugene/src/site/resources/xmi/objectmodel.zargo trunk/eugene/src/site/rst/LutinGenerator.rst trunk/eugene/src/site/rst/generatorHelp.rst trunk/eugene/src/site/rst/index.rst trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java trunk/eugene/src/test/resources/log4j.properties trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security1.properties trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel trunk/eugene/src/test/resources/models/objectmodel/security6.properties trunk/eugene/src/test/resources/models/statemodel/contact.properties trunk/eugene/src/test/resources/models/statemodel/contact.statemodel trunk/eugene/src/test/resources/models/statemodel/project.statemodel trunk/eugene/src/test/resources/models/uimodel/test.javaxml trunk/eugene/src/test/resources/models/uimodel/test1.javaxml trunk/eugene/src/test/resources/models/uimodel/test2.javaxml trunk/eugene/src/test/resources/uml/Acceleo.Business.profile.uml trunk/eugene/src/test/resources/xmi/1.2/dependency.xmi trunk/eugene/src/test/resources/xmi/1.2/enumeration.xmi trunk/eugene/src/test/resources/xmi/1.2/isis-fish.xmi trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi trunk/eugene/src/test/resources/xmi/1.2/topiatest.zargo trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.uml trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.umldi trunk/eugene/src/test/resources/xmi/2.1/cmsCore.uml trunk/eugene/src/test/resources/xmi/2.1/cmsLink.uml trunk/eugene/src/test/resources/xmi/2.1/http-storage-api/src/main/uml/conception.uml trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.uml trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.umldi trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.uml trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.umldi trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.uml trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.umldi trunk/eugene/src/test/resources/xmi/2.1/vpod.uml trunk/maven-eugene-plugin/LICENSE.txt trunk/maven-eugene-plugin/README.txt trunk/maven-eugene-plugin/changelog.txt trunk/maven-eugene-plugin/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/README.txt trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/xmi/README.txt trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/topiatest3.xmi trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi2/topiatest2.xmi trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.xmi trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/evol-879/zargo/README.txt trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/topiatest3.zargo trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.zargo trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi2/topiatest2.zargo trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.zargo trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/README.txt trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.zargo trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/README.txt trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.zargo trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.zargo trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy trunk/maven-eugene-plugin/src/it/settings.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/LICENSE.txt trunk/maven-eugene-plugin/src/it/smart-generate/all/README.txt trunk/maven-eugene-plugin/src/it/smart-generate/all/changelog.txt trunk/maven-eugene-plugin/src/it/smart-generate/all/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.zargo trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/generators/LICENSE.txt trunk/maven-eugene-plugin/src/it/smart-generate/generators/README.txt trunk/maven-eugene-plugin/src/it/smart-generate/generators/changelog.txt trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/README.txt trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.xmi trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.zargo trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/README.txt trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.zargo trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.zargo trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java trunk/maven-eugene-plugin/src/main/resources/log4j.properties trunk/maven-eugene-plugin/src/site/fr/rst/example.rst trunk/maven-eugene-plugin/src/site/fr/rst/index.rst trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst trunk/maven-eugene-plugin/src/site/rst/example.rst trunk/maven-eugene-plugin/src/site/rst/index.rst trunk/maven-eugene-plugin/src/site/rst/usage.rst trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml trunk/maven-eugene-plugin/src/xmi/.dummy trunk/maven-eugene-plugin/src/xmi/chorem_diagram.zuml trunk/pom.xml trunk/src/site/fr/rst/01-introduction.rst trunk/src/site/fr/rst/02-objectmodel.rst trunk/src/site/fr/rst/03-generation.rst trunk/src/site/fr/rst/04-templates.rst trunk/src/site/fr/rst/05-execution.rst trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst trunk/src/site/fr/rst/07-glossaire.rst trunk/src/site/fr/rst/08-FAQ.rst trunk/src/site/fr/rst/09-tutoriel-index.rst trunk/src/site/fr/rst/eugene-plan.rst trunk/src/site/fr/rst/index.rst trunk/src/site/resources/binaries/EUGene-generate.vpp trunk/src/site/resources/binaries/eugene_v2.0.zargo trunk/src/site/resources/binaries/eugene_v2.0_simplify.zargo trunk/src/site/resources/objectmodel/Hotel.objectmodel.png trunk/src/site/resources/objectmodel/Hotel.png trunk/src/site/resources/objectmodel/ObjectModel.png trunk/src/site/resources/objectmodel/ObjectModel_Generator.png trunk/src/site/resources/objectmodel/ObjectModel_Interfaces.png trunk/src/site/resources/schemas/03-generation-complete.png trunk/src/site/resources/schemas/03-generation-java.png trunk/src/site/resources/schemas/03-generation-simple.png trunk/src/site/resources/schemas/04-templates-hierarchy.png trunk/src/site/rst/01-introduction.rst trunk/src/site/rst/02-objectmodel.rst trunk/src/site/rst/03-generation.rst trunk/src/site/rst/04-templates.rst trunk/src/site/rst/05-execution.rst trunk/src/site/rst/06-fonctionnalites-avancees.rst trunk/src/site/rst/07-glossaire.rst trunk/src/site/rst/08-FAQ.rst trunk/src/site/rst/09-tutoriel-index.rst trunk/src/site/rst/index.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/site/fr/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/site/resources/build.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/BasicObjectModelGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security1.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security2.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security3.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security4.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security5.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/models/objectmodel/security6.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/uml/Acceleo.Business.profile.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/1.2/dependency.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/1.2/enumeration.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/1.2/isis-fish.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/1.2/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/TestXMI21.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/cmsCore.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/cmsLink.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/http-storage-api/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/ant-eugene-task/src/test/resources/xmi/2.1/vpod.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/TODO ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/Etude_JavaModel_EUGene.pdf ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/Metamodel_Java_04-02-02.pdf ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/JavaModel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/ObjectModel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/ObjectModel_Interfaces.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/description_metamodel_java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/eugen_java.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/1-javamodel/sources/eugene_objectmodel.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/JavaBuilder.pdf ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources/JavaBuilder.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources/ObjectModel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources/ObjectModelBuilderHelper.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources/description_javabuilder ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources/eugene_javabuilder.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/2-javabuilder/sources.tar.gz ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/eugene2.0.pdf ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene1.0.1_Generation.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene2.0_Generation.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/DiagActivite_EUGene2.0_GenerationJava.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/DiagClasses_Generators.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/EUGene-generate.vpp ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/eugene2.0 ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/doc/3-v2.0/sources/eugene_v2.0.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/AbstractMetaTransformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorException.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/MonitorWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/PackageValidator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/Template.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManager.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/AnnotationsManagerExtension.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManager.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ConstantsManagerExtension.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManager.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ImportsManagerExtension.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/package-info.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/Model.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelBuilder.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelDependency.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelEnumeration.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelModifier.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelTransformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelType.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtension.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelDependencyImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelEnumerationImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModel.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelState.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/package-info.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/AbstractChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterConfiguration.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedFileWriterEntry.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/ChainedWriterEngine.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/writer/package-info.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resolver-cache/META-INF/cache/argouml.org/profiles/um… ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resolver-cache/META-INF/cache/argouml.org/profiles/um… ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/dtd/objectmodel.dtd ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/dtd/statemodel.dtd ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/xmi/default-java.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/xmi/default-uml14.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/xsd/objectmodel.xsd ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/resources/xsd/todo.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/xsl/poseidon2argouml.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/xsl/xmi1.2ToStateModel.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/fr/rst/DevUIDoc.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/fr/rst/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/fr/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/fr/rst/plugineclipse.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/StateModel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/plugin_choix.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/plugin_menu.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/plugin_newdepot.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/plugin_typeinstall.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/images/plugin_utilisation_editeur.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/models/buix.guix ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/models/exemple.topiaModel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/xmi/ObjectModel.zuml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/resources/xmi/objectmodel.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/rst/LutinGenerator.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/rst/generatorHelp.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security1.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security1.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security2.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security3.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security4.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security5.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security6.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/objectmodel/security6.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/statemodel/contact.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/statemodel/contact.statemodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/statemodel/project.statemodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/uimodel/test.javaxml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/uimodel/test1.javaxml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/models/uimodel/test2.javaxml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/uml/Acceleo.Business.profile.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/1.2/dependency.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/1.2/enumeration.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/1.2/isis-fish.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/1.2/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/1.2/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/TestXMI21.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/cmsCore.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/cmsLink.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/http-storage-api/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.container.nomenclature/src/main/uml/conception.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception-helper.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/org.sharengo.utils.utils/src/main/uml/conception.umldi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/eugene/src/test/resources/xmi/2.1/vpod.uml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/models2/topiatest2.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-api/src/main/resources/topiatest3.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest4.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/model-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/model/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/topiatest3.xmi =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/topiatest3.xmi 2010-11-28 11:22:01 UTC (rev 1011) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/topiatest3.xmi 2010-11-28 11:24:27 UTC (rev 1012) @@ -2,7 +2,7 @@ <XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> <XMI.header> <XMI.documentation> <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date: 2010-04-10 00:56:51 +0200 (sam., 10 avr. 2010) $ </XMI.exporterVersion> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/topiatest3.xmi ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.xmi =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.xmi 2010-11-28 11:22:01 UTC (rev 1011) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.xmi 2010-11-28 11:24:27 UTC (rev 1012) @@ -2,7 +2,7 @@ <XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> <XMI.header> <XMI.documentation> <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date: 2010-04-10 00:56:51 +0200 (sam., 10 avr. 2010) $ </XMI.exporterVersion> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.xmi ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi2/topiatest2.xmi =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi2/topiatest2.xmi 2010-11-28 11:22:01 UTC (rev 1011) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi2/topiatest2.xmi 2010-11-28 11:24:27 UTC (rev 1012) @@ -2,7 +2,7 @@ <XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> <XMI.header> <XMI.documentation> <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date: 2010-04-10 00:56:51 +0200 (sam., 10 avr. 2010) $ </XMI.exporterVersion> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi2/topiatest2.xmi ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.xmi =================================================================== --- trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.xmi 2010-11-28 11:22:01 UTC (rev 1011) +++ trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.xmi 2010-11-28 11:24:27 UTC (rev 1012) @@ -2,7 +2,7 @@ <XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> <XMI.header> <XMI.documentation> <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date: 2010-04-10 00:56:51 +0200 (sam., 10 avr. 2010) $ </XMI.exporterVersion> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> </XMI.documentation> <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> <XMI.content> Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/main/xmi/topiatest4.xmi ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/xmi/xmi-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/topiatest3.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi2/topiatest2.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/evol-879/zargo/zargo-impl/src/test/java/org/nuiton/eugne/plugin/GenerationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/main/xmi/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/src/test/xmi/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/settings.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/models/dtotest2.objectmodel ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/generators/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/xmi/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/src/main/zargo/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/invoker.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/xmi/topiatest.xmi ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/src/main/zargo/topiatest.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/it/smart-generate/only-zargo-xmi/verify.groovy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/BaseChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/fr/rst/example.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/fr/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/rst/example.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/rst/usage.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/xmi/.dummy ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/maven-eugene-plugin/src/xmi/chorem_diagram.zuml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/01-introduction.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/02-objectmodel.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/03-generation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/04-templates.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/05-execution.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/07-glossaire.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/08-FAQ.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/09-tutoriel-index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/eugene-plan.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/fr/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/binaries/EUGene-generate.vpp ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/binaries/eugene_v2.0.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/binaries/eugene_v2.0_simplify.zargo ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/objectmodel/Hotel.objectmodel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/objectmodel/Hotel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/objectmodel/ObjectModel.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/objectmodel/ObjectModel_Generator.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/objectmodel/ObjectModel_Interfaces.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/03-generation-complete.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/03-generation-java.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/03-generation-simple.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/04-templates-hierarchy.png ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/01-introduction.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/02-objectmodel.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/03-generation.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/04-templates.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/05-execution.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/06-fonctionnalites-avancees.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/07-glossaire.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/08-FAQ.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/09-tutoriel-index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL

1 0

r1011 - in trunk: ant-eugene-task/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/models/object eugene/src/test/java/org/nuiton/eugene eugene/src/test/java/org/nuiton/eugene/java eugene/src/test/java/org/nuiton/eugene/models/object eugene/src/test/java/org/nuiton/eugene/models/object/xml eugene/src/test/java/org/nuiton/eugene/models/state
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 12:22:01 +0100 (Sun, 28 Nov 2010) New Revision: 1011 Url: http://nuiton.org/repositories/revision/eugene/1011 Log: Evolution #1115: Make ModelReader#read throws an IOException Evolution #1114: Sanity tests Evolution #1113: Introduce contracts *EugeneTagValues* (*EugeneStereoTypes*) to push all constants about tagvalues (stereotypes) usable in eugene generators. Improve the loading of model properties, now for my taste : it is perfect (I remove all colors from it, be SURE of it...) Added: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java Modified: trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java Modified: trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -352,10 +352,10 @@ if ("object".equals(transformation)) { ModelReader<ObjectModel> objectModelReader = new ObjectModelReader(); - ObjectModel model = - objectModelReader.read(modelFilesArray); try { - generator.applyTemplate(model, destDir); + ObjectModel model = + objectModelReader.read(modelFilesArray); + generator.applyTemplate(model, destDir); } catch (IOException e) { throw new BuildException( "Can't apply template on object model", e); @@ -365,8 +365,8 @@ else if ("state".equals(transformation)) { ModelReader<StateModel> stateModelReader = new StateModelReader(); - Model model = stateModelReader.read(modelFilesArray); try { + Model model = stateModelReader.read(modelFilesArray); generator.applyTemplate(model, destDir); } catch (IOException e) { throw new BuildException( Added: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -0,0 +1,46 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene; + +import org.nuiton.eugene.java.JavaBeanTransformer; + +/** + * Defines all stereotypes managed by Eugene. + * + * In another library using eugene, please extends this contract to put your + * own stereotypes, to get a unique place where to find stereotypes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.2.1 + */ +public interface EugeneStereoTypes { + + /** + * Stereotype for JavaBean objects. + * + * @see JavaBeanTransformer + */ + String STEREOTYPE_BEAN = "bean"; +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneStereoTypes.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java (rev 0) +++ trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -0,0 +1,65 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene; + +import org.nuiton.eugene.java.JavaBeanTransformer; + +/** + * Defines all tag values managed by Eugene. + * + * In another library using eugene, please extends this contract to put your + * own tag values, to get a unique place where to find tag values. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.2.1 + */ +public interface EugeneTagValues { + + /** + * tag value to add on constants enumeration (or other incoming dev) + * a prefix to constant to generate. + */ + String TAG_CONSTANT_PREFIX = "constantPrefix"; + + /** + * tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). + * @see JavaBeanTransformer + */ + String TAG_NO_PCS= "noPCS"; + + /** + * tag value to add the version of the model from outside (says in the + * properties file associated to the model).. + * + * @since 2.2.1 + */ + String TAG_VERSION = "version"; + + /** + * Tag pour specfier if i18n must be generated. + * @since 2.2.1 + */ + String TAG_I18N_PREFIX = "i18n"; +} Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/EugeneTagValues.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -130,9 +130,9 @@ if (attribute instanceof ObjectModelAttribute && isNMultiplicity((ObjectModelAttribute) attribute)) { if (attribute.isOrdered()) { - result = "java.util.List"; + result = List.class.getName(); } else { - result = "java.util.Collection"; + result = Collection.class.getName(); } if (useGenerics) { result += "<" + attribute.getType() + ">"; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ModelReader.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -30,6 +30,7 @@ import org.nuiton.eugene.models.Model; import java.io.File; +import java.io.IOException; /** * ModelReader TODO real doc :) @@ -83,7 +84,8 @@ * * @param file files to read * @return the new model builded from files + * @throws IOException if any IO errors while reading files */ - public abstract M read(File... file); + public abstract M read(File... file) throws IOException; } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -27,6 +27,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.EugeneStereoTypes; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelInterface; @@ -52,8 +54,8 @@ * * Since version 2.2.1, it is possible to * <ul> - * <li>generate a simple POJO (says with no PCS support) by using the tag value {@link JavaGeneratorUtil#TAG_NO_PCS}.</li> - * <li>generate i18n keys using the tag value {@link JavaGeneratorUtil#TAG_I18N_PREFIX}.</li> + * <li>generate a simple POJO (says with no PCS support) by using the tag value {@link EugeneTagValues#TAG_NO_PCS}.</li> + * <li>generate i18n keys using the tag value {@link EugeneTagValues#TAG_I18N_PREFIX}.</li> * </ul> * * @author tchemit <chemit(a)codelutin.com> @@ -90,7 +92,7 @@ ObjectModelClass ouputImpl = generateImpl(input, output); - String noPCSTagValue = input.getTagValue(JavaGeneratorUtil.TAG_NO_PCS); + String noPCSTagValue = input.getTagValue(EugeneTagValues.TAG_NO_PCS); boolean usePCS = StringUtils.isEmpty(noPCSTagValue) || !"true".equals(noPCSTagValue.trim()); @@ -558,7 +560,7 @@ } protected boolean canGenerate(ObjectModelClass input) { - return input.hasStereotype(JavaGeneratorUtil.STEREOTYPE_BEAN); + return input.hasStereotype(EugeneStereoTypes.STEREOTYPE_BEAN); } protected void createPropertyChangeSupport(ObjectModelClass output) { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGeneratorUtil.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -24,6 +24,7 @@ */ package org.nuiton.eugene.java; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -44,35 +45,7 @@ public static final String OPERATION_GETTER_BOOLEAN_PREFIX = "is"; - /** Stereotype for JavaBean objects. */ - public static final String STEREOTYPE_BEAN = "bean"; - /** - * tag value to add on constants enumeration (or other incoming dev) - * a prefix to constant to generate. - */ - public static final String TAG_CONSTANT_PREFIX = "constantPrefix"; - - /** - * tag value to set if do not want any pcs (says PropertyChangeSupport in a generated bean). - * @see JavaBeanTransformer - */ - public static final String TAG_NO_PCS= "noPCS"; - - /** - * tag value to add the version of the model from outside (says in the - * properties file associated to the model).. - * - * @since 2.2.1 - */ - public static final String TAG_VERSION = "version"; - - /** - * Tag pour specfier if i18n must be generated. - * @since 2.2.1 - */ - public static final String TAG_I18N_PREFIX = "i18n"; - /** * dependency to add constants in interfaces via an enumeration. * * The literals of enumeration will be the value, and constant names will @@ -150,6 +123,6 @@ */ public static String getI18nPrefix(ObjectModelElement element, ObjectModel model) { - return findTagValue(TAG_I18N_PREFIX, element, model); + return findTagValue(EugeneTagValues.TAG_I18N_PREFIX, element, model); } } Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -32,7 +32,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; -import java.util.Iterator; import java.util.Set; /*{generator option: parentheses = false}*/ Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -29,6 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; @@ -194,7 +195,7 @@ // look if there is a constant_prefix tag value String prefix = JavaGeneratorUtil.findTagValue( - JavaGeneratorUtil.TAG_CONSTANT_PREFIX, + EugeneTagValues.TAG_CONSTANT_PREFIX, input, getModel() ); @@ -739,7 +740,7 @@ * * If found, add all literals on {@code output} model as constants. * - * You can add a {@link JavaGeneratorUtil#TAG_CONSTANT_PREFIX} to your + * You can add a {@link EugeneTagValues#TAG_CONSTANT_PREFIX} to your * enumeration to prefix constant names. * * @param input the input model @@ -802,7 +803,7 @@ /** * Used to initialize constant prefix depends on model tagvalue {@link - * JavaGeneratorUtil#TAG_CONSTANT_PREFIX}. If no tagvalue found, the default + * EugeneTagValues#TAG_CONSTANT_PREFIX}. If no tagvalue found, the default * value will be an empty prefix. */ public void initConstantPrefixFromModel() { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -30,18 +30,18 @@ import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.ModelReader; -import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; import org.nuiton.eugene.models.object.xml.ObjectModelAssociationClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelClassifierImpl; import org.nuiton.eugene.models.object.xml.ObjectModelElementImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImplRef; -import org.nuiton.eugene.models.object.xml.ObjectModelImplTagValue; import org.nuiton.util.FileUtil; import org.nuiton.util.RecursiveProperties; import org.nuiton.util.StringUtil; +import org.xml.sax.SAXException; import java.io.File; import java.io.FileInputStream; @@ -49,6 +49,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.regex.Matcher; @@ -92,7 +93,8 @@ */ protected Pattern propertiesPattern = Pattern .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?$"); - protected Pattern propertyStereotypePattern = Pattern + + protected Pattern stereotypePattern = Pattern .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype)?)$"); /** @@ -113,7 +115,7 @@ * stereotype ou des tag value sur les class, attribute ou operation */ @Override - public ObjectModel read(File... files) { + public ObjectModel read(File... files) throws IOException { setLastModifiedSource(files); if (log.isDebugEnabled()) { log.debug("LastModifiedSource = " + getLastModifiedSource() + @@ -130,10 +132,11 @@ try { digester.push(model); model = (ObjectModel) digester.parse(file); - } catch (Exception e) { - if (log.isWarnEnabled()) { - log.warn("Unable to parse ObjectModel input file : " + file, e); - } + } catch (SAXException e) { + throw new IOException("Unable to parse ObjectModel input file : " + file, e); +// if (log.isWarnEnabled()) { +// log.warn("Unable to parse ObjectModel input file : " + file, e); +// } } // recherche est charge le fichier propriete associe au modele @@ -151,7 +154,7 @@ log.info("Lecture du fichier de propriete " + propFile + " associé au model"); } - loadTagValues(propFile, model); + loadModelProperties(propFile, model); } } if (log.isDebugEnabled()) { @@ -194,22 +197,23 @@ return result; } - public Properties loadTagValues(File propFile, ObjectModel model) { + public Properties loadModelProperties(File propFile, ObjectModel model) throws IOException { Properties prop = new RecursiveProperties(); +// try { + FileInputStream inStream = new FileInputStream(propFile); try { - FileInputStream inStream = new FileInputStream(propFile); - try { - prop.load(inStream); - } finally { - inStream.close(); - } - } catch (IOException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible de lire le fichier de propriete " - + propFile, eee); - } + prop.load(inStream); + } finally { + inStream.close(); } +// } catch (IOException eee) { +// +// if (log.isWarnEnabled()) { +// log.warn("Impossible de lire le fichier de propriete " +// + propFile, eee); +// } +// } // number of sucessfull imported tag values into model int numberImportedTagValues = 0; @@ -223,165 +227,255 @@ for (String key : keys) { String value = prop.getProperty(key); + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "' = " + value); + } + if (key.startsWith(MODEL)) { // model tag value - Matcher matcher = modelTagValuePattern.matcher(key); + boolean loaded = loadModelTagvalue(model, key, value); - if (!matcher.find()) { - if (log.isWarnEnabled()) { - log.warn("Invalid model tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); - } - continue; - } - String tag = matcher.group(2); - ObjectModelImpl modelImpl = (ObjectModelImpl) model; - if (tag.equals(JavaGeneratorUtil.TAG_VERSION)) { + if (loaded) { - // push directly the version in the model version - // property - modelImpl.setVersion(value); + numberImportedTagValues++; } - if (isVerbose()) { - log.info("import model tag value " + key + " --> " + tag + " = " + value); - } - modelImpl.addTagValue(tag, value); - numberImportedTagValues++; continue; } - // element tag value - Matcher matcher = propertiesPattern.matcher(key); + // element tag value or stereotype - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "'"); - } + if (key.contains(STEREOTYPE)) { - if (!matcher.find()) { + // stereotype property - // try with the stereotype - matcher = propertyStereotypePattern.matcher(key); + boolean loaded = loadStereotype(model, key, value); - if (!matcher.find()) { + if (loaded) { + numberImportedTagValues++; + } - if (log.isWarnEnabled()) { - log.warn("Invalid tag value [" + key + "] : syntax is not correct."); - } - continue; - } + continue; + } - String fqn = matcher.group(1); - fqn = StringUtil.substring(fqn, 0, -1); // remove ended - // . - // target is class, attribute or operation - String target = matcher.group(2); - String targetName = matcher.group(3); - // type is stereotype or tagvalue - String type = matcher.group(4).toLowerCase(); + // tag value property - String tag; + boolean loaded = loadTagValue(model, key, value); - if (STEREOTYPE.equals(type)) { - - // using a stereotype means nothing after the type - tag = null; - } else { - tag = matcher.group(5); + if (loaded) { + numberImportedTagValues++; } + } + if (log.isInfoEnabled()) { + log.info(numberImportedTagValues + " tag values were succesfull imported from " + propFile); + } + int nbFailed = prop.size() - numberImportedTagValues; + if (nbFailed > 0 && isVerbose()) { + log.info(nbFailed + " tag values failed to be imported from " + propFile); + } + return prop; + } - if (log.isDebugEnabled()) { - log.debug("Propriete: '" + key + "' => " - + "fqn:" + fqn + " target:" + target - + " targetName:" + targetName - + " type:" + type + " tag:" + tag); + public boolean loadModelTagvalue(ObjectModel model, String key, String value) { + Matcher matcher = modelTagValuePattern.matcher(key); + + if (!matcher.find()) { + if (log.isWarnEnabled()) { + log.warn("Invalid model tag value [" + key + "] : only tagvalue or tagValue is allowed on model in properties"); } + return false; + } + String tag = matcher.group(2); + ObjectModelImpl modelImpl = (ObjectModelImpl) model; + if (tag.equals(EugeneTagValues.TAG_VERSION)) { - ObjectModelClassifier omc = model.getClassifier(fqn); - if (omc == null) { - if (log.isWarnEnabled()) { - log.warn("Invalid tag value [" + key + - "] : Could not find classifier for " + fqn); - } - continue; + // push directly the version in the model version + // property + modelImpl.setVersion(value); + } + if (isVerbose()) { + log.info("import model tag value " + key + " --> " + tag + " = " + value); + } + modelImpl.addTagValue(tag, value); + return true; + } + + public boolean loadStereotype(ObjectModel model, String key, String value) { + Matcher matcher = stereotypePattern.matcher(key); + + if (!matcher.find()) { + + if (log.isWarnEnabled()) { + log.warn("Invalid stereotype [" + key + "] : syntax is not correct."); } + return false; + } - //todo tchemit 2010-11-25 : what does it mean ? every thing extends ObjectModelClassifierImpl - if (!(omc instanceof ObjectModelClassifierImpl)) { - // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message + String fqn = matcher.group(1); + fqn = StringUtil.substring(fqn, 0, -1); // remove ended + // . + // target is class, attribute or operation + String target = matcher.group(2); + String targetName = matcher.group(3); + + // type is stereotype or tagvalue + String type = matcher.group(4).toLowerCase(); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "' => " + + "fqn:" + fqn + " target:" + target + + " targetName:" + targetName + + " type:" + type); + } + + ObjectModelClassifier omc = getClassifier(model, STEREOTYPE, key, fqn); + if (omc == null) { + return false; + } + + List<ObjectModelElement> elems = getObjectElements(omc, STEREOTYPE, key, fqn, target, targetName); + + if (elems == null) { + return false; + } + + for (ObjectModelElement elem1 : elems) { + if (elem1 == null) { if (log.isWarnEnabled()) { - log.warn("Can't add properties to model, " + - "it's not an " + - "ObjectModelClassifierImpl : " + - omc.getQualifiedName()); + log.warn("Invalid stereotype [" + key + "] : Element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "' is null."); } continue; } + ObjectModelElementImpl elem = (ObjectModelElementImpl) elem1; - List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); - if (CLASS.equals(target)) { - elems.add(omc); - } else if (ATTRIBUTE.equals(target)) { + // pour les stereotypes + ObjectModelImplRef stereotype = new ObjectModelImplRef(); + stereotype.setName(value); + elem.addStereotype(stereotype); + } - ObjectModelAttribute attr = - getAttribute((ObjectModelClass) omc, targetName); - elems.add(attr); + if (isVerbose()) { + log.info("import stereotype " + key + " --> " + fqn + ":" + target + ":" + targetName + ":" + type + " = " + value); + } - } else if (OPERATION.equals(target)) { - elems.addAll(omc.getOperations(targetName)); + return true; + } + + private boolean loadTagValue(ObjectModel model, String key, String value) { + Matcher matcher = propertiesPattern.matcher(key); + + if (!matcher.find()) { + + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : syntax is not correct."); } + return false; + } - if (elems.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("Invalid tag value [" + key + "] : Could not find any element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "'."); - } + String fqn = matcher.group(1); + fqn = StringUtil.substring(fqn, 0, -1); // remove ended + // . + // target is class, attribute or operation + String target = matcher.group(2); + String targetName = matcher.group(3); + // type is stereotype or tagvalue + String type = matcher.group(4).toLowerCase(); + + String tag = matcher.group(5); + + if (log.isDebugEnabled()) { + log.debug("Propriete: '" + key + "' => " + + "fqn:" + fqn + " target:" + target + + " targetName:" + targetName + + " type:" + type + " tag:" + tag); + } + + ObjectModelClassifier omc = getClassifier(model, TAGVALUE, key, fqn); + if (omc == null) { + return false; + } + + List<ObjectModelElement> elements = + getObjectElements(omc, TAGVALUE, key, fqn, target, targetName); + + if (elements == null) { + return false; + } + + for (ObjectModelElement element : elements) { + + if (log.isDebugEnabled()) { + log.debug("add tagValue " + tag + + ", value:" + value + + " to element:" + element); } - for (Object elem1 : elems) { - if (elem1 == null) { - if (log.isWarnEnabled()) { - log.warn("Invalid tag value [" + key + "] : Element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "' is null."); - } - continue; - } - ObjectModelElementImpl elem = - (ObjectModelElementImpl) elem1; - if (STEREOTYPE.equals(type)) { - // pour les stereotypes - ObjectModelImplRef stereotype = new ObjectModelImplRef(); - stereotype.setName(value); - elem.addStereotype(stereotype); - continue; - } + ((ObjectModelElementImpl) element).addTagValue(tag, value); - if (TAGVALUE.equals(type)) { - // pour les tagvalues - ObjectModelImplTagValue tagvalue = - new ObjectModelImplTagValue(); - tagvalue.setName(tag); - tagvalue.setValue(value); - if (log.isDebugEnabled()) { - log.debug("tagValue:" + tagvalue - + ", tag:" + tag - + ", value:" + value - + ", element:" + elem); - } - elem.addTagValue(tagvalue); + } + if (isVerbose()) { + log.info("import tag value " + key + " --> " + fqn + ":" + target + ":" + targetName + ":" + type + ":" + tag + " = " + value); + } + return true; + } - } + protected ObjectModelClassifier getClassifier(ObjectModel model, String type, String key, String fqn) { + ObjectModelClassifier omc = model.getClassifier(fqn); + if (omc == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid " + type + " [" + key + + "] : Could not find classifier for " + fqn); } - if (isVerbose()) { - log.info("import tag value " + key + " --> " + fqn + ":" + target + ":" + targetName + ":" + type + ":" + tag+" = " + value); + return null; + } + + //todo tchemit 2010-11-25 : what does it mean ? every thing extends ObjectModelClassifierImpl + if (!(omc instanceof ObjectModelClassifierImpl)) { + // TODO il faudra avoir des methodes d'acces en Set sur l'interface pour eviter ce message + if (log.isWarnEnabled()) { + log.warn("Can't add properties to model, " + + "it's not an " + + "ObjectModelClassifierImpl : " + + omc.getQualifiedName()); } - numberImportedTagValues++; + return null; } - if (log.isInfoEnabled()) { - log.info(numberImportedTagValues + " tag values were succesfull imported from " + propFile); + return omc; + } + + protected List<ObjectModelElement> getObjectElements(ObjectModelClassifier omc, String type, String key, String fqn, String target, String targetName) { + List<ObjectModelElement> elems = new ArrayList<ObjectModelElement>(); + if (CLASS.equals(target)) { + elems.add(omc); + } else if (ATTRIBUTE.equals(target)) { + + ObjectModelAttribute attr = + getAttribute((ObjectModelClass) omc, targetName); + elems.add(attr); + + } else if (OPERATION.equals(target)) { + elems.addAll(omc.getOperations(targetName)); } - int nbFailed = prop.size() - numberImportedTagValues; - if (nbFailed > 0 && isVerbose()) { - log.info(nbFailed + " tag values failed to be imported from " + propFile); + + if (elems.isEmpty()) { + if (log.isWarnEnabled()) { + log.warn("Invalid " + type + " [" + key + "] : Could not find any element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "'."); + } + return null; } - return prop; + + Iterator<ObjectModelElement> itr = elems.iterator(); + while (itr.hasNext()) { + ObjectModelElement element = itr.next(); + if (element == null) { + if (log.isWarnEnabled()) { + log.warn("Invalid " + type + " [" + key + "] : Element '" + targetName + "' of type '" + target + "' on classifier '" + fqn + "' is null."); + } + itr.remove(); + } + } + + return elems; } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/GeneratorUtilTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -36,20 +36,14 @@ import static org.junit.Assert.assertEquals; -/** - * - * @author fdesbois - */ +/** @author fdesbois */ public class GeneratorUtilTest { private static Log log = LogFactory.getLog(GeneratorUtilTest.class); - public GeneratorUtilTest() { - } - @Test public void testGetOperationParametersListName() { - log.info("getOperationParametersListName"); + log.debug("getOperationParametersListName"); ObjectModelOperationImpl op = new ObjectModelOperationImpl(); @@ -76,7 +70,7 @@ @Test public void testGetOperationParametersListDeclaration() { - log.info("getOperationParametersListDeclaration"); + log.debug("getOperationParametersListDeclaration"); ObjectModelOperationImpl op = new ObjectModelOperationImpl(); @@ -104,12 +98,10 @@ } - /** - * Test of getSimpleName method, of class GeneratorUtil. - */ + /** Test of getSimpleName method, of class GeneratorUtil. */ @Test public void testGetSimpleName() { - log.info("getSimpleName"); + log.debug("getSimpleName"); String str = "List"; String expResult = "List"; @@ -142,7 +134,7 @@ assertEquals(expResult, result); str = "java.util.Set<java.util.Collection<java.util.Collection<java.util.Collection" + - "<java.lang.String>>>>"; + "<java.lang.String>>>>"; expResult = "Set<Collection<Collection<Collection<String>>>>"; result = GeneratorUtil.getSimpleName(str); log.info(str + " -> " + result); @@ -209,7 +201,7 @@ */ @Test public void testGetSimpleNameAndRemoveGenericsDefinition() { - log.info("getSimpleName"); + log.debug("getSimpleName"); String str = "List"; String expResult = "List"; @@ -242,7 +234,7 @@ assertEquals(expResult, result); str = "java.util.Set<java.util.Collection<java.util.Collection<java.util.Collection" + - "<java.lang.String>>>>"; + "<java.lang.String>>>>"; expResult = "Set<Collection<Collection<Collection<String>>>>"; result = GeneratorUtil.getSimpleName(str, true); log.info(str + " -> " + result); @@ -304,12 +296,10 @@ } - /** - * Test of removeGenericDefinition method, of class GeneratorUtil. - */ + /** Test of removeGenericDefinition method, of class GeneratorUtil. */ @Test public void testRemoveGenericDefinition() { - log.info("removeGenericDefinition"); + log.debug("removeGenericDefinition"); String str = "List"; String expResult = "List"; @@ -415,7 +405,7 @@ assertEquals(2, results.size()); str = "java.util.Set<java.util.Collection<java.util.Collection<java.util.Collection" + - "<java.lang.String>>>>"; + "<java.lang.String>>>>"; results = GeneratorUtil.getTypesList(str); log.info(str + " -> " + results); assertEquals(3, results.size()); @@ -439,12 +429,12 @@ results = GeneratorUtil.getTypesList(str); log.info(str + " -> " + results); assertEquals(4, results.size()); - + str = "java.util.List<java.util.Map<java.util.Date, java.lang.Integer>>"; results = GeneratorUtil.getTypesList(str); log.info(str + " -> " + results); assertEquals(4, results.size()); - + str = "java.util.TreeMap<java.util.ArrayList<java.util.Date>, java.util.SortedSet<java.lang.Number, java.lang.Double>>"; results = GeneratorUtil.getTypesList(str); log.info(str + " -> " + results); Added: trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java (rev 0) +++ trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -0,0 +1,69 @@ +/* + * #%L + * EUGene :: EUGene + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Ignore; + +import java.io.File; + +/** + * Helper for all eugene tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.2.1 + */ +@Ignore +// this is not a test :) +public class TestHelper { + + private static final Log log = LogFactory.getLog(TestHelper.class); + + protected static File testBasedir; + + protected static File targetdir; + + protected static File dirDatabase; + + public static File getTestWorkdir() { + if (testBasedir == null) { + String base = System.getProperty("java.io.tmpdir"); + if (base == null || base.isEmpty()) { + base = new File("").getAbsolutePath(); + } + testBasedir = new File(base); + log.info("basedir for test " + testBasedir); + } + return testBasedir; + } + + public static File getTestBasedir(Class<?> testClass) { + File dir = getTestWorkdir(); + File result = new File(dir, testClass.getName()); + return result; + } + +} Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/TestHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerExtensionTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,48 +25,35 @@ package org.nuiton.eugene.java; -import java.util.List; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; -import static org.junit.Assert.*; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; import org.nuiton.eugene.models.object.xml.ObjectModelImpl; +import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + + /** * ImportsManagerExtensionTest - * + * * Created: 2 nov. 2009 * * @author fdesbois * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + * + * Mise a jour: $Date$ + * par : + */ public class ImportsManagerExtensionTest { - public ImportsManagerExtensionTest() { - } - @BeforeClass - public static void setUpClass() throws Exception { - } + private static final Log log = + LogFactory.getLog(ImportsManagerExtensionTest.class); - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** * Test of getManager method, of class ImportsManagerExtension. * Prerequisite : Existing ObjectModel containing a classifier @@ -75,7 +62,7 @@ */ @Test public void testGetManager() { - System.out.println("getManager"); + log.debug("getManager"); ImportsManagerExtension managers = new ImportsManagerExtension(); @@ -101,7 +88,7 @@ */ @Test public void testGetImports() { - System.out.println("getImports"); + log.debug("getImports"); ImportsManagerExtension managers = new ImportsManagerExtension(); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/ImportsManagerTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,87 +25,87 @@ package org.nuiton.eugene.java; +import junit.framework.TestCase; + import java.io.Serializable; import java.util.List; -import junit.framework.TestCase; - public class ImportsManagerTest extends TestCase { - private ImportsManager mgr; + private ImportsManager mgr; - @Override - protected void setUp() throws Exception { - mgr = new ImportsManager(); - } + @Override + protected void setUp() throws Exception { + mgr = new ImportsManager(); + } - public void testAddImport() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs + public void testAddImport() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertFalse(mgr.addImport("org.chorem.eugene.Tutu")); //Conflict, package differs - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Toto")); + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Toto")); - assertTrue(mgr.addImport(Serializable.class)); - assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); - } + assertTrue(mgr.addImport(Serializable.class)); + assertFalse(mgr.addImport("org.nuiton.eugene.Serializable")); + } - public void testGetType() throws Exception { - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); - assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance - assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); - assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs + public void testGetType() throws Exception { + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); + assertEquals("Toto", mgr.getType("org.nuiton.eugene.Toto")); //Repeat to test acceptance + assertEquals("Tutu", mgr.getType("org.nuiton.eugene.Tutu")); + assertEquals("org.chorem.eugene.Tutu", mgr.getType("org.chorem.eugene.Tutu")); //Conflict, package differs - assertEquals("void", mgr.getType("void")); - assertEquals("boolean", mgr.getType("boolean")); - assertEquals("Byte", mgr.getType("Byte")); - assertEquals("Toto", mgr.getType("java.lang.Toto")); - assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); - } + assertEquals("void", mgr.getType("void")); + assertEquals("boolean", mgr.getType("boolean")); + assertEquals("Byte", mgr.getType("Byte")); + assertEquals("Toto", mgr.getType("java.lang.Toto")); + assertEquals("java.lang.sub.Toto", mgr.getType("java.lang.sub.Toto")); + } - public void testGetImports() throws Exception { - assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); - assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); - List<String> imports = mgr.getImports("org.nuiton.eugene"); - assertEquals(1, imports.size()); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); + public void testGetImports() throws Exception { + assertTrue(mgr.addImport("org.nuiton.eugene.Toto")); + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); + assertTrue(mgr.addImport("org.nuiton.eugene.subpackage.Tata")); + List<String> imports = mgr.getImports("org.nuiton.eugene"); + assertEquals(1, imports.size()); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(0)); - imports = mgr.getImports("org.nuiton"); - assertEquals(3, imports.size()); - // Check using alphabetic sort - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); + imports = mgr.getImports("org.nuiton"); + assertEquals(3, imports.size()); + // Check using alphabetic sort + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + assertEquals("org.nuiton.eugene.subpackage.Tata", imports.get(2)); - imports = mgr.getImports("org.chorem"); - assertEquals(3, imports.size()); + imports = mgr.getImports("org.chorem"); + assertEquals(3, imports.size()); - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - assertTrue(mgr.addImport("java.lang.String")); - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); - assertEquals("org.nuiton.eugene.Toto", imports.get(0)); - assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); + assertTrue(mgr.addImport("java.lang.String")); + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); + assertEquals("org.nuiton.eugene.Toto", imports.get(0)); + assertEquals("org.nuiton.eugene.Tutu", imports.get(1)); - assertTrue(mgr.addImport("void")); - assertTrue(mgr.addImport("boolean")); - assertTrue(mgr.addImport("Byte")); - assertTrue(mgr.addImport("java.lang.Toto")); - assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused - assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject - imports = mgr.getImports("org.nuiton.eugene.subpackage"); - assertEquals(2, imports.size()); + assertTrue(mgr.addImport("void")); + assertTrue(mgr.addImport("boolean")); + assertTrue(mgr.addImport("Byte")); + assertTrue(mgr.addImport("java.lang.Toto")); + assertFalse(mgr.addImport("java.lang.sub.Titi")); // Read as started, import is refused + assertTrue(mgr.addImport("org.nuiton.eugene.Tutu")); //Already present, must not reject + imports = mgr.getImports("org.nuiton.eugene.subpackage"); + assertEquals(2, imports.size()); - } + } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/java/JavaBuilderTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,15 +25,11 @@ package org.nuiton.eugene.java; -import java.util.List; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.nuiton.eugene.GeneratorUtilTest; import org.nuiton.eugene.models.object.ObjectModel; -import static org.junit.Assert.*; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -42,47 +38,40 @@ import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.eugene.models.object.xml.ObjectModelBuilderTest; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * JavaBuilderTest - * + * * Created: 29 oct. 2009 * * @author fdesbois * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + * + * Mise a jour: $Date$ + * par : + */ public class JavaBuilderTest { - public JavaBuilderTest() { - } + private static final Log log = LogFactory.getLog(JavaBuilderTest.class); - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** * Test of getModel. * No test needed : model created in modelBuilder instanciated in * constructor (ObjectModelBuilder). - * - * @see ObjectModelBuilderTest#testGetModel() + * + * @see ObjectModelBuilderTest#testGetModel() */ @Test public void testGetModel() { - System.out.println("getModel"); + log.debug("getModel"); JavaBuilder builder = new JavaBuilder("TestModel"); @@ -95,11 +84,12 @@ * - Add a simple type to import. * - Add a type to import with generic (List of Category) : two imports are added. * NOTE : Use of ImportsManager addImport() method and GeneratorUtil getTypesList() method. + * * @see GeneratorUtilTest#testGetTypesList() */ @Test public void testAddImport() { - System.out.println("addImport"); + log.debug("addImport"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); @@ -118,11 +108,12 @@ /** * Test of createClass method, of class JavaBuilder. * No test needed : call of createClass in ObjectModelBuilder + * * @see ObjectModelBuilderTest#testCreateClass() */ @Test public void testCreateClass() { - System.out.println("createClass"); + log.debug("createClass"); JavaBuilder builder = new JavaBuilder("TestModel"); @@ -136,7 +127,7 @@ */ @Test public void testCreateAbstractClass() { - System.out.println("createAbstractClass"); + log.debug("createAbstractClass"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClass clazz = builder.createAbstractClass("Person", "org.chorem.bonzoms"); @@ -147,11 +138,12 @@ * Test of setSuperClass method, of class JavaBuilder. * Only one superclass can be set. * Check imports on superclass qualified name + * * @see ObjectModelBuilderTest#testAddSuperclass() */ @Test public void testSetSuperClass() { - System.out.println("setSuperClass"); + log.debug("setSuperClass"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClass clazz = builder.createClass("Person", "org.chorem.bonzoms"); @@ -171,22 +163,23 @@ List<String> imports = ext.getImports(clazz); assertEquals(0, imports.size()); } - + /** * Test of addInterface method, of class JavaBuilder. * Check imports on adding interface : imports added on interfaceQualifiedName + * * @see ObjectModelBuilderTest#testAddInterface() */ @Test public void testAddInterface() { - System.out.println("addInterface"); + log.debug("addInterface"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); String interfaceQualifiedName = "java.io.Serializable"; builder.addInterface(classifier, interfaceQualifiedName); - + // Check imports ImportsManagerExtension ext = builder.getModel().getExtension( ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class); @@ -203,13 +196,13 @@ */ @Test public void testAddConstant() { - System.out.println("addConstant"); + log.debug("addConstant"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelAttribute constant = builder.addConstant(classifier, "GENDER_MALE", "boolean", "true", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); assertTrue(constant.isFinal()); assertTrue(constant.isStatic()); @@ -218,21 +211,22 @@ /** * Test of addAttribute method, of class JavaBuilder. * Check imports on adding attribute : imports added on type and value. + * * @see ObjectModelBuilderTest#testAddAttribute() */ @Test public void testAddAttribute() { - System.out.println("addAttribute"); + log.debug("addAttribute"); JavaBuilder builder = new JavaBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); builder.addAttribute(classifier, "firstName", "java.lang.String", "", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); builder.addAttribute(classifier, "roles", "java.util.List<org.chorem.bonzoms.Role>", - "new ArrayList<Role>()", - ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + "new ArrayList<Role>()", + ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); // ANO#474 : manage manually imports for defaultValue builder.addImport(classifier, "java.util.ArrayList"); @@ -242,7 +236,7 @@ ImportsManagerExtension.OBJECTMODEL_EXTENSION, ImportsManagerExtension.class); List<String> imports = ext.getImports(classifier); - // no imports for org.chorem.bonzoms.Role and java.lang.String + // no imports for org.chorem.bonzoms.Role and java.lang.String assertEquals(2, imports.size()); assertTrue(imports.contains("java.util.ArrayList")); assertTrue(imports.contains("java.util.List")); @@ -255,11 +249,11 @@ */ @Test public void testAddAttributeObjectModelClassifierObjectModelAttribute() { - System.out.println("addAttribute"); + log.debug("addAttribute"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelAttributeImpl attribute = new ObjectModelAttributeImpl(); - attribute.setName("name"); + attribute.setName("name"); attribute.setType("java.lang.String"); attribute.setVisibility("public"); attribute.setStatic(false); @@ -281,7 +275,7 @@ */ @Test public void testAddConstructor() { - System.out.println("addConstructor"); + log.debug("addConstructor"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelClass clazz = builder.createClass("Person", "org.chorem.bonzoms"); @@ -296,22 +290,23 @@ /** * Test of addOperation method, of class JavaBuilder. * Check imports on adding operation : returnType of the operation + * * @see ObjectModelBuilderTest#testAddOperation() */ @Test public void testAddOperation() { - System.out.println("addOperation"); + log.debug("addOperation"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation result = builder.addOperation(classifier, - "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); - + "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); + result = builder.addOperation(classifier, "addPropertyChangeListener", null, - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); // Check imports ImportsManagerExtension ext = builder.getModel().getExtension( @@ -325,18 +320,19 @@ /** * Test of addParameter method, of class JavaBuilder. * Check imports on adding parameter : type of the parameter + * * @see ObjectModelBuilderTest#testAddParameter() */ @Test public void testAddParameter() { - System.out.println("addParameter"); + log.debug("addParameter"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); builder.addParameter(operation, "java.lang.String", "name"); @@ -352,18 +348,19 @@ /** * Test of addException method, of class JavaBuilder. * Check imports on adding exception : exception name + * * @see ObjectModelBuilderTest#testAddException() */ @Test public void testAddException() { - System.out.println("addException"); + log.debug("addException"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); builder.addException(operation, "java.lang.IllegalArgumentException"); @@ -378,24 +375,25 @@ /** * Test of setOperationBody method, of class JavaBuilder. * No body code for an abstract operation : throw an IllegalArgumentException + * * @see ObjectModelBuilderTest#testSetOperationBody() */ @Test public void testSetOperationBody() { - System.out.println("setOperationBody"); + log.debug("setOperationBody"); JavaBuilder builder = new JavaBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); try { builder.setOperationBody(operation, "this.name = name"); } catch (Exception eee) { assertEquals(IllegalArgumentException.class, eee.getClass()); - System.out.println("expected exception : " + eee.getMessage()); + log.debug("expected exception : " + eee.getMessage()); } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,17 +25,16 @@ package org.nuiton.eugene.models.object; -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Collection; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.Resource; +import java.io.File; +import java.net.URL; +import java.util.Collection; + /** * ModelMergeTest. * @@ -46,48 +45,46 @@ */ public class ModelMergeTest { - /** - * Logger - */ + /** Logger. */ private static final Log log = LogFactory.getLog(ModelMergeTest.class); @Test - public void testMerge1() throws URISyntaxException { + public void testMerge1() throws Exception { parcourirModel(genModel(1), 4); } @Test - public void testMerge2() throws URISyntaxException { + public void testMerge2() throws Exception { parcourirModel(genModel(2), 4); } @Test - public void testMerge3() throws URISyntaxException { + public void testMerge3() throws Exception { parcourirModel(genModel(3), 4); } @Test - public void testMerge4() throws URISyntaxException { + public void testMerge4() throws Exception { parcourirModel(genModel(4), 4); } @Test - public void testMerge5() throws URISyntaxException { + public void testMerge5() throws Exception { parcourirModel(genModel(5), 4); } @Test - public void testMerge6() throws URISyntaxException { + public void testMerge6() throws Exception { parcourirModel(genModel(6), 4); } - protected ObjectModel genModel(int num) throws URISyntaxException { + protected ObjectModel genModel(int num) throws Exception { if (log.isDebugEnabled()) { log.debug("\n\n============================================\n\t\ttestMerge" + num + "\n============================================"); } // ObjectModelGenerator generator = new ObjectModelGenerator(); File[] files = new File[num]; - for (int j = 1; j < (num + 1); j++) { + for (int j = 1; j < num + 1; j++) { URL url = Resource.getURL("models/objectmodel/security" + j + ".objectmodel"); files[j - 1] = new File(url.toURI()); } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ObjectModelGeneratorTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,11 +25,7 @@ package org.nuiton.eugene.models.object; -import java.util.ArrayList; -import java.util.List; - import junit.framework.Assert; - import org.junit.Test; import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.xml.ObjectModelClassImpl; @@ -37,27 +33,28 @@ /** * Test des fonctions de ObjectModelGenerator. - * + * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class ObjectModelGeneratorTest { @Test public void testCanGenerate() { - + ObjectModelGenerator generator = new ObjectModelGenerator(); - + // test with null generated list Assert.assertTrue(generator.canGenerateElement(new ObjectModelElementImpl())); Assert.assertTrue(generator.canGenerateElement(new ObjectModelClassImpl())); - + // List<String> generatedPackages = new ArrayList<String>(); // generatedPackages.add("org.nuiton.eugene"); - - generator.setProperty(Template.PROP_GENERATED_PACKAGES , "org.nuiton.eugene"); + + generator.setProperty(Template.PROP_GENERATED_PACKAGES, "org.nuiton.eugene"); // generator.setGeneratedPackages(generatedPackages); // Still true @@ -65,41 +62,41 @@ // become false boolean b = generator.canGenerateElement(new ObjectModelClassImpl()); Assert.assertFalse(b); - + ObjectModelClassImpl testClass = new ObjectModelClassImpl(); testClass.setPackage("org.nuiton.eugene"); Assert.assertTrue(generator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton"); Assert.assertFalse(generator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene.entities"); Assert.assertTrue(generator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene2"); Assert.assertFalse(generator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene2.entities"); Assert.assertFalse(generator.canGenerateElement(testClass)); - + // test avec les generators recursifs // sans faire de set sur le fils ObjectModelGenerator childGenerator = new ObjectModelGenerator(generator); - + testClass.setPackage("org.nuiton.eugene"); Assert.assertTrue(childGenerator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton"); Assert.assertFalse(childGenerator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene.entities"); Assert.assertTrue(childGenerator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene2"); Assert.assertFalse(childGenerator.canGenerateElement(testClass)); - + testClass.setPackage("org.nuiton.eugene2.entities"); Assert.assertFalse(childGenerator.canGenerateElement(testClass)); - + } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,47 +25,54 @@ package org.nuiton.eugene.models.object; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.eugene.TestHelper; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ResourceResolver; -import java.util.List; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.util.Resource; -import org.nuiton.util.ResourceResolver; - /** * Test de la feuille de style "xmi1.2ToObjectModel.xsl" * sur l'exemple isis-fish.xmi * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class XMI12ToObjectModelTest { - protected File destinationDirectory; + protected static File destinationDirectory; - @Before - public void setUp() { - destinationDirectory = new File("target", "xmi"); - destinationDirectory.mkdirs(); + @BeforeClass + public static void beforeTest() throws IOException { + destinationDirectory = TestHelper.getTestBasedir(XMI12ToObjectModelTest.class); + FileUtil.createDirectoryIfNecessary(destinationDirectory); } +// @Before +// public void setUp() { +// destinationDirectory = new File("target", "xmi"); +// destinationDirectory.mkdirs(); +// } + /** * Apply XSLT Transformation. - * + * * @param xmiFile * @param modelFile * @return transformed file @@ -96,11 +103,12 @@ /** * Load model into memory. - * + * * @param modelFile * @return object model + * @throws IOException */ - protected ObjectModel loadModel(File modelFile) { + protected ObjectModel loadModel(File modelFile) throws IOException { // ObjectModelGenerator generator = new ObjectModelGenerator(); ObjectModelReader reader = new ObjectModelReader(); ObjectModel model = reader.read(modelFile); @@ -114,7 +122,7 @@ /** * Apply XSL stylesheet on a topcased model. * And make test on it. - * + * * @throws Exception */ @Test @@ -135,7 +143,7 @@ /** * Apply XSL stylesheet on a topcased model. * And make test on it. - * + * * @throws Exception */ @Test @@ -147,9 +155,9 @@ File objectModelFile = transformXMI(xmiFile, "topiatest.objectmodel"); ObjectModel model = loadModel(objectModelFile); - + // Test for model version - Assert.assertEquals("1.2",model.getVersion()); + Assert.assertEquals("1.2", model.getVersion()); Assert.assertNotNull(model); Assert.assertEquals("TopiaTest", model.getName()); @@ -176,7 +184,7 @@ /** * Apply XSL stylesheet on an Argouml model. * And make test on it. - * + * * @throws Exception */ @Test @@ -201,7 +209,7 @@ } } - Assert.assertEquals(4,nbDependencies); + Assert.assertEquals(4, nbDependencies); } /** @@ -227,7 +235,7 @@ for (ObjectModelEnumeration enumeration : model.getEnumerations()) { // 1 seule énumeration avec 3 literals et 2 opérations Assert.assertNotNull(enumeration.getQualifiedName()); - Assert.assertEquals(3,enumeration.getLiterals().size()); + Assert.assertEquals(3, enumeration.getLiterals().size()); Assert.assertEquals(2, enumeration.getOperations().size()); } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,11 +25,18 @@ package org.nuiton.eugene.models.object; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.eugene.TestHelper; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ResourceResolver; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -38,40 +45,41 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.util.Resource; -import org.nuiton.util.ResourceResolver; - /** * Test de la feuille de style "xmi2.1ToObjectModel.xsl" * sur l'exemple TestXMI21.uml * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class XMI21ToObjectModelTest { - protected File destinationDirectory; + protected static File destinationDirectory; - @Before - public void setUp() { - destinationDirectory = new File("target", "xmi"); - destinationDirectory.mkdirs(); + @BeforeClass + public static void beforeTest() throws IOException { + destinationDirectory = TestHelper.getTestBasedir(XMI21ToObjectModelTest.class); + FileUtil.createDirectoryIfNecessary(destinationDirectory); } +// @Before +// public void setUp() { +// destinationDirectory = new File("target", "xmi"); +// destinationDirectory.mkdirs(); +// } + /** * Apply XSLT Transformation. - * + * * @param xmiFile * @return transformed file * @throws IOException @@ -104,11 +112,11 @@ /** * Load model into memory. - * + * * @param modelFile * @return object model */ - protected ObjectModel loadModel(File modelFile) { + protected ObjectModel loadModel(File modelFile) throws IOException { ObjectModelReader reader = new ObjectModelReader(); ObjectModel model = reader.read(modelFile); return model; @@ -120,12 +128,11 @@ /** * Apply xslt on xmi model, and load it. - * + * * @param modelName model to load - * - * @throws URISyntaxException - * @throws TransformerException - * @throws IOException + * @throws URISyntaxException + * @throws TransformerException + * @throws IOException */ protected ObjectModel xmiToObjectModel(String modelName) throws URISyntaxException, IOException, TransformerException { File xmiFile = new File(Resource.getURL("xmi/2.1/" + modelName + ".uml") @@ -136,11 +143,11 @@ ObjectModel model = loadModel(objectModelFile); return model; } - + /** * Apply XSL stylesheet on a topcased model. * And make test on it. - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -178,7 +185,7 @@ /** * Apply XSL stylesheet on a topcased model. * And make test on it. - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -192,7 +199,7 @@ assertNotNull(model); assertEquals("org::sharengo::s4a::storage::http::vpod", model.getName()); assertEquals(4, model.getClassifiers().size()); - + // ClassB ObjectModelClass clazzVpodMappingDao = model.getClass("daos.VpodMappingDao"); assertNotNull(clazzVpodMappingDao); @@ -204,11 +211,11 @@ opFindByVpodIdParams.addAll(opFindByVpodId.get(0).getParameters()); assertEquals("String", opFindByVpodIdParams.get(0).getType()); } - + /** * Apply XSL stylesheet on a topcased model. * And make test on it. - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -232,7 +239,7 @@ ObjectModelAttribute attrDefinition = clazzLinkEntity.getAttribute("target"); assertNotNull(attrDefinition); assertTrue(attrDefinition.hasStereotype("Embedded")); - + // LinkEntity ObjectModelClass clazzLinkSrv = model.getClass("org.sharengo.utils.container.link.services.LinkSrv"); assertNotNull(clazzLinkSrv); @@ -248,12 +255,12 @@ ObjectModel model = xmiToObjectModel("cmsCore"); assertNotNull(model); - + // There was a problem with sub package ObjectModelClass clazzFacetViewSrv = model.getClass("org.sharengo.cms.core.services.facet.FacetViewSrv"); assertNotNull(clazzFacetViewSrv); assertEquals(11, clazzFacetViewSrv.getOperations().size()); - + // Test attribute type FQN ObjectModelClass clazzContentDefSearchDto = model.getClass("org.sharengo.cms.core.dtos.ContentDefSearchDto"); assertNotNull(clazzContentDefSearchDto); @@ -277,7 +284,7 @@ /** * Apply XSL stylesheet on a topcased model. * And make test on embedded primitive type - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -290,7 +297,7 @@ assertNotNull(model); assertEquals("XMITest21", model.getName()); - + // ClassB ObjectModelClass clazzB = model.getClass("org.nuiton.eugene.test21.ClassB"); assertNotNull(clazzB); @@ -308,13 +315,13 @@ ObjectModelAttribute attrFormula = clazzC.getAttribute("formula"); assertNotNull(attrFormula); assertEquals("org.codelutin.types.Formula", attrFormula.getType()); - + } /** * Apply XSL stylesheet on a topcased model. * And make test on embedded primitive type - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -430,19 +437,19 @@ } private ObjectModelParameter findParameter(ObjectModelOperation op, String name) { - for (ObjectModelParameter param : op.getParameters()) { - if (name.equals(param.getName())) { - return param; - } - } - return null; + for (ObjectModelParameter param : op.getParameters()) { + if (name.equals(param.getName())) { + return param; + } + } + return null; } /** * Apply XSL stylesheet on a topcased model. * And make test on embedded primitive type - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -461,12 +468,12 @@ assertNotNull(strings); assertEquals("String", strings.getType()); assertTrue(strings.isStatic()); - assertEquals("azerty",strings.getDefaultValue()); + assertEquals("azerty", strings.getDefaultValue()); // static operation ObjectModelClass classD = model.getClass("org.nuiton.eugene.test21.ClassD"); assertNotNull(classD); - List<ObjectModelOperation> operations = (List<ObjectModelOperation>)classD.getOperations("getInstance"); + List<ObjectModelOperation> operations = (List<ObjectModelOperation>) classD.getOperations("getInstance"); assertEquals(operations.size(), 1); assertTrue(operations.get(0).isStatic()); } @@ -474,7 +481,7 @@ /** * Apply XSL stylesheet on a topcased model. * And make test on embedded primitive type - * + * * @throws URISyntaxException * @throws IOException * @throws TransformerException @@ -515,10 +522,10 @@ // OuterClass ObjectModelClass outer = model.getClass("org.nuiton.eugene.test21.OuterClass"); - List<ObjectModelClassifier> inners = (List<ObjectModelClassifier>)outer.getInnerClassifiers(); + List<ObjectModelClassifier> inners = (List<ObjectModelClassifier>) outer.getInnerClassifiers(); assertNotNull(inners); assertEquals(inners.size(), 1); - + // InnerClass ObjectModelClass inner = (ObjectModelClass) inners.get(0); assertNotNull(inner); @@ -565,7 +572,7 @@ ObjectModelClass clazzB = model.getClass("org.nuiton.eugene.test21.ClassB"); assertNotNull(clazzB); assertEquals("This is some documentation\non multiple lines !\n\nVery hard to do !", clazzB.getDocumentation()); - + } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ExternalCacheExtensionTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -26,45 +26,27 @@ package org.nuiton.eugene.models.object.xml; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.nuiton.eugene.models.object.ObjectModelInterface; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * ExternalCacheExtensionTest - * + * * Created: 2 nov. 2009 * * @author fdesbois * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public class ExternalCacheExtensionTest { - public ExternalCacheExtensionTest() { - } + private static final Log log = + LogFactory.getLog(ExternalCacheExtensionTest.class); - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** * Test of getCache method, of class ExternalCacheExtension. * Prerequisite : Existing model @@ -73,7 +55,7 @@ */ @Test public void testGetCache() { - System.out.println("getCache"); + log.debug("getCache"); ObjectModelImpl model = new ObjectModelImpl(); model.setName("TestModel"); @@ -83,12 +65,12 @@ // Creation if not exist ExternalCacheExtension cache = - model.getExtension(ExternalCacheExtension.OBJECTMODEL_EXTENSION, ExternalCacheExtension.class); + model.getExtension(ExternalCacheExtension.OBJECTMODEL_EXTENSION, ExternalCacheExtension.class); ObjectModelInterface interfacez = cache.getCache(refInterface, ObjectModelInterfaceImpl.class); - assertNotNull(interfacez); + assertNotNull(interfacez); ObjectModelInterface interfacez2 = cache.getCache(refInterface, ObjectModelInterfaceImpl.class); @@ -104,8 +86,8 @@ */ @Test public void testAddClassifierToCache() { - System.out.println("addClassifierToCache"); - + log.debug("addClassifierToCache"); + ObjectModelImpl model = new ObjectModelImpl(); model.setName("TestModel"); @@ -115,7 +97,7 @@ ObjectModelClassifierImpl classifier = new ObjectModelInterfaceImpl(); ExternalCacheExtension cache = - model.getExtension(ExternalCacheExtension.OBJECTMODEL_EXTENSION, ExternalCacheExtension.class); + model.getExtension(ExternalCacheExtension.OBJECTMODEL_EXTENSION, ExternalCacheExtension.class); cache.addClassifierToCache(refInterface, classifier); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelBuilderTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -26,48 +26,41 @@ package org.nuiton.eugene.models.object.xml; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelBuilder; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; + import java.util.Iterator; import java.util.List; import java.util.Set; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.nuiton.eugene.models.object.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * ObjectModelBuilder - * + * * Created: 3 nov. 2009 * * @author fdesbois * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ + */ public class ObjectModelBuilderTest { - public ObjectModelBuilderTest() { - } + private static final Log log = + LogFactory.getLog(ObjectModelBuilderTest.class); - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - /** * Test of getModel method, of class ObjectModelBuilder. * Prerequisite : instanciation of ObjectModelBuilder. @@ -75,10 +68,10 @@ */ @Test public void testGetModel() { - System.out.println("getModel"); + log.debug("getModel"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); - + assertNotNull(builder.getModel()); assertEquals("TestModel", builder.getModel().getName()); } @@ -91,17 +84,17 @@ */ @Test public void testAddTagValue() { - System.out.println("addTagValue"); + log.debug("addTagValue"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); builder.addTagValue("fr.ifremer.isisfish.types.Month", - "fr.ifremer.isisfish.types.hibernate.MonthType"); + "fr.ifremer.isisfish.types.hibernate.MonthType"); // model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType ObjectModel model = builder.getModel(); assertEquals("fr.ifremer.isisfish.types.hibernate.MonthType", - model.getTagValue("fr.ifremer.isisfish.types.Month")); + model.getTagValue("fr.ifremer.isisfish.types.Month")); // fr.isisfish.entities.Population.attribute.name.tagvalue.pk=topiaId ObjectModelClass clazz = builder.createClass("Population", "fr.isisfish.entities"); @@ -118,7 +111,7 @@ */ @Test public void testCreateClass() { - System.out.println("createClass"); + log.debug("createClass"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); @@ -130,12 +123,10 @@ assertEquals("org.chorem.bonzoms.Person", clazz.getQualifiedName()); } - /** - * Test of createInterface method, of class ObjectModelBuilder. - */ + /** Test of createInterface method, of class ObjectModelBuilder. */ //@Test public void testCreateInterface() { - System.out.println("createInterface"); + log.debug("createInterface"); } /** @@ -145,11 +136,11 @@ */ @Test public void testAddAttributeWithoutDefaultValue() { - System.out.println("addAttribute"); + log.debug("addAttribute"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); - ObjectModelAttribute attribute = builder.addAttribute(classifier, "firstName", "java.lang.String"); + ObjectModelAttribute attribute = builder.addAttribute(classifier, "firstName", "java.lang.String"); assertEquals("", attribute.getDefaultValue()); } @@ -161,13 +152,13 @@ */ @Test public void testAddAttribute() { - System.out.println("addAttribute"); + log.debug("addAttribute"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelAttribute attribute = builder.addAttribute(classifier, "firstName", "java.lang.String", "", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); assertNotNull(attribute); assertEquals("firstName", attribute.getName()); @@ -178,8 +169,8 @@ assertFalse(attribute.isStatic()); attribute = builder.addAttribute(classifier, "roles", "java.lang.List<org.chorem.bonzoms.Role>", - "new java.lang.ArrayList<org.chorem.bonzoms.Role>()", - ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); + "new java.lang.ArrayList<org.chorem.bonzoms.Role>()", + ObjectModelModifier.PRIVATE, ObjectModelModifier.STATIC); assertEquals("new java.lang.ArrayList<org.chorem.bonzoms.Role>()", attribute.getDefaultValue()); assertTrue(attribute.isStatic()); @@ -193,13 +184,13 @@ */ @Test public void testAddOperation() { - System.out.println("addOperation"); + log.debug("addOperation"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation result = builder.addOperation(classifier, - "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); + "methodName", "java.util.List<java.lang.String>", ObjectModelModifier.PUBLIC); assertNotNull(result); assertEquals(result.getName(), "methodName"); assertEquals(result.getReturnType(), "java.util.List<java.lang.String>"); @@ -207,7 +198,7 @@ assertFalse(result.isAbstract()); result = builder.addOperation(classifier, "addPropertyChangeListener", "void", - ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); + ObjectModelModifier.PUBLIC, ObjectModelModifier.ABSTRACT); assertTrue(result.isAbstract()); } @@ -218,14 +209,14 @@ */ @Test public void testSetOperationBody() { - System.out.println("setOperationBody"); + log.debug("setOperationBody"); ObjectModelBuilder builder = new ObjectModelBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); builder.setOperationBody(operation, "this.name = name"); assertNotNull(operation.getBodyCode()); @@ -240,7 +231,7 @@ */ @Test public void testAddInterface() { - System.out.println("addInterface"); + log.debug("addInterface"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); @@ -261,7 +252,7 @@ */ @Test public void testAddSuperclass() { - System.out.println("addSuperclass"); + log.debug("addSuperclass"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); ObjectModelClass clazz = builder.createClass("Person", "org.chorem.bonzoms"); @@ -279,21 +270,21 @@ */ @Test public void testAddParameter() { - System.out.println("addParameter"); + log.debug("addParameter"); ObjectModelBuilder builder = new ObjectModelBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); ObjectModelParameter param = builder.addParameter(operation, "java.lang.String", "name"); assertNotNull(param); assertEquals(param.getName(), "name"); assertEquals(param.getType(), "java.lang.String"); - List<ObjectModelParameter> listParams = (List<ObjectModelParameter>)operation.getParameters(); + List<ObjectModelParameter> listParams = (List<ObjectModelParameter>) operation.getParameters(); ObjectModelParameter param1 = listParams.get(0); assertEquals(param1, param); } @@ -305,14 +296,14 @@ */ @Test public void testAddException() { - System.out.println("addException"); + log.debug("addException"); ObjectModelBuilder builder = new ObjectModelBuilder("modelName"); ObjectModelClassifier classifier = builder.createClass("Person", "org.chorem.bonzoms"); ObjectModelOperation operation = builder.addOperation(classifier, "setName", "java.lang.String", - ObjectModelModifier.PUBLIC); + ObjectModelModifier.PUBLIC); builder.addException(operation, "java.lang.IllegalArgumentException"); Set<String> exceptions = operation.getExceptions(); @@ -323,12 +314,10 @@ assertEquals(it.next(), "java.lang.IllegalArgumentException"); } - /** - * Test of setDocumentation method, of class ObjectModelBuilder. - */ + /** Test of setDocumentation method, of class ObjectModelBuilder. */ //@Test public void testSetDocumentation() { - System.out.println("setDocumentation"); + log.debug("setDocumentation"); } /** @@ -338,7 +327,7 @@ */ @Test public void testAddAssociation() { - System.out.println("addAssociation"); + log.debug("addAssociation"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); @@ -347,7 +336,7 @@ ObjectModelClass classB = builder.createClass("Vote", "org.chorem.pollen.business.persistence"); ObjectModelAttribute assoc = builder.addAssociation(classA, classB, "poll", 1, 1, - ObjectModelModifier.COMPOSITE, ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); + ObjectModelModifier.COMPOSITE, ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); assertNotNull(assoc); assertTrue(assoc.isNavigable()); @@ -368,7 +357,7 @@ */ @Test public void testAddReverseAssociation() { - System.out.println("addReverseAssociation"); + log.debug("addReverseAssociation"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); @@ -377,7 +366,7 @@ ObjectModelClass classB = builder.createClass("Vote", "org.chorem.pollen.business.persistence"); ObjectModelAttribute assocA = builder.addAssociation(classA, classB, "poll", 1, 1, - ObjectModelModifier.COMPOSITE, ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); + ObjectModelModifier.COMPOSITE, ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); ObjectModelAttribute assocB = builder.addReverseAssociation(assocA, "vote", 0, -1); @@ -393,8 +382,8 @@ */ @Test public void testCreateAssociationClass() { - System.out.println("createAssociationClass"); - + log.debug("createAssociationClass"); + ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); ObjectModelClass classA = builder.createClass("Vote", "org.chorem.pollen.business.persistence"); @@ -402,13 +391,13 @@ ObjectModelClass classB = builder.createClass("Choice", "org.chorem.pollen.business.persistence"); ObjectModelAttribute assocA = builder.addAssociation(classA, classB, "vote", 0, -1, - ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); + ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); ObjectModelAttribute assocB = builder.addReverseAssociation(assocA, "choice", 1, -1, - ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); + ObjectModelModifier.NAVIGABLE, ObjectModelModifier.ORDERED); ObjectModelAssociationClass assocClass = builder.createAssociationClass("VoteToChoice", - "org.chorem.pollen.business.persistence", assocA, assocB); + "org.chorem.pollen.business.persistence", assocA, assocB); List<ObjectModelClassifier> classifiers = assocClass.getParticipantsClassifiers(); @@ -417,12 +406,10 @@ assertTrue(classifiers.contains(classB)); } - /** - * Test of addStereotype method, of class ObjectModelBuilder. - */ + /** Test of addStereotype method, of class ObjectModelBuilder. */ @Test public void testAddStereotype() { - System.out.println("addStereotype"); + log.debug("addStereotype"); ObjectModelBuilder builder = new ObjectModelBuilder("TestModel"); @@ -433,7 +420,7 @@ builder.addStereotype(classA, "entity"); assertEquals(1, classA.getStereotypes().size()); - + } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -27,41 +27,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.eugene.java.ImportsManagerExtension; -import static org.junit.Assert.*; -/** - * - * @author fdesbois - */ +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +/** @author fdesbois */ public class ObjectModelImplTest { private static final Log log = LogFactory.getLog(ObjectModelImplTest.class); - public ObjectModelImplTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - // /** // * Test of setName method, of class ObjectModelImpl. // */ @@ -364,8 +340,8 @@ */ @Test public void testGetExtension() { - System.out.println("getExtension"); - + log.debug("getExtension"); + ObjectModelImpl model = new ObjectModelImpl(); model.setName("TestModel"); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,16 +25,6 @@ package org.nuiton.eugene.models.state; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - import org.junit.Test; import org.nuiton.util.Resource; import org.xml.sax.EntityResolver; @@ -43,53 +33,62 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; + /** * StateModelTest.java * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class StateModelDTDTest { /** * Test la validation des DTD sur les modeles XML. - * @throws SAXException - * @throws ParserConfigurationException - * @throws IOException - * @throws URISyntaxException - * - * FIXME this test doesn't valid anything + * + * @throws SAXException + * @throws ParserConfigurationException + * @throws IOException + * @throws URISyntaxException FIXME this test doesn't valid anything */ @Test public void testCorrectStateModel() throws ParserConfigurationException, SAXException, IOException, URISyntaxException { - + File[] testFiles = { new File(Resource.getURL("models/statemodel/project.statemodel").toURI()), new File(Resource.getURL("models/statemodel/contact.statemodel").toURI()) }; - for( File file : testFiles) { - SAXParserFactory factory = SAXParserFactory.newInstance(); + for (File file : testFiles) { + SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setValidating(true); factory.setNamespaceAware(true); SAXParser parser = factory.newSAXParser(); // --- Set Input source InputSource source = new InputSource(new FileInputStream(file)); - + // --- parse XMLReader reader = parser.getXMLReader(); reader.setContentHandler(new DefaultHandler()); reader.setErrorHandler(new DefaultHandler()); - reader.setEntityResolver( new EntityResolver() { + reader.setEntityResolver(new EntityResolver() { @Override public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - + String dtd = systemId.substring(systemId.lastIndexOf("/")); - + URL url = Resource.getURL("dtd/" + dtd); InputSource source; try { @@ -97,11 +96,11 @@ } catch (URISyntaxException e) { throw new SAXException(e); } - + return source; } }); - reader.parse(source); + reader.parse(source); } } } Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2010-11-28 01:01:44 UTC (rev 1010) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2010-11-28 11:22:01 UTC (rev 1011) @@ -25,25 +25,26 @@ package org.nuiton.eugene.models.state; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.util.Resource; + import java.io.File; import java.net.URISyntaxException; import java.util.Collection; import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.util.Resource; - /** * StateModelTest.java * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : */ + * + * Last update : $Date$ + * By : + */ public class StateModelTest { /** model */

1 0

r1010 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 02:01:44 +0100 (Sun, 28 Nov 2010) New Revision: 1010 Url: http://nuiton.org/repositories/revision/eugene/1010 Log: fix tag value importing with stereotype Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 00:29:07 UTC (rev 1009) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 01:01:44 UTC (rev 1010) @@ -91,7 +91,9 @@ * fr.isisfish.entities.Population.operation.getRegion.tagvalue.pk=... */ protected Pattern propertiesPattern = Pattern - .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype|tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?$"); + .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?$"); + protected Pattern propertyStereotypePattern = Pattern + .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype)?)$"); /** * Pattern to define tag values authorized at model level in the model @@ -242,7 +244,7 @@ modelImpl.setVersion(value); } if (isVerbose()) { - log.info("import model tag value " + key); + log.info("import model tag value " + key + " --> " + tag + " = " + value); } modelImpl.addTagValue(tag, value); numberImportedTagValues++; @@ -257,10 +259,17 @@ } if (!matcher.find()) { - if (log.isWarnEnabled()) { - log.warn("Invalid tag value [" + key + "] : syntax is not correct."); + + // try with the stereotype + matcher = propertyStereotypePattern.matcher(key); + + if (!matcher.find()) { + + if (log.isWarnEnabled()) { + log.warn("Invalid tag value [" + key + "] : syntax is not correct."); + } + continue; } - continue; } String fqn = matcher.group(1); @@ -271,8 +280,17 @@ String targetName = matcher.group(3); // type is stereotype or tagvalue String type = matcher.group(4).toLowerCase(); - String tag = matcher.group(5); + String tag; + + if (STEREOTYPE.equals(type)) { + + // using a stereotype means nothing after the type + tag = null; + } else { + tag = matcher.group(5); + } + if (log.isDebugEnabled()) { log.debug("Propriete: '" + key + "' => " + "fqn:" + fqn + " target:" + target

1 0

r1009 - trunk/maven-eugene-plugin/src/main/resources
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 01:29:07 +0100 (Sun, 28 Nov 2010) New Revision: 1009 Url: http://nuiton.org/repositories/revision/eugene/1009 Log: delete unused directory Removed: trunk/maven-eugene-plugin/src/main/resources/META-INF/

1 0

r1008 - trunk/eugene/src/main/resources/xsd
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 01:28:56 +0100 (Sun, 28 Nov 2010) New Revision: 1008 Url: http://nuiton.org/repositories/revision/eugene/1008 Log: Evolution #1111: Update objectmodel xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd =================================================================== --- trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-28 00:28:37 UTC (rev 1007) +++ trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-28 00:28:56 UTC (rev 1008) @@ -58,13 +58,21 @@ <xsd:sequence> <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="extern" type="xsd:boolean" use="optional"/> + <xsd:attribute name="abstract" type="xsd:boolean" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:complexType name="associationClass"> <xsd:complexContent> - <xsd:extension base="classifier"/> + <xsd:extension base="classifier"> + <xsd:sequence> + <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="participant" type="participant" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="abstract" type="xsd:boolean" use="optional"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -76,6 +84,7 @@ <xsd:complexType name="superclass"> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator" type="xsd:string" use="optional"/> </xsd:complexType> <xsd:complexType name="superinterface"> @@ -85,6 +94,7 @@ <xsd:complexType name="attribute"> <xsd:sequence> <xsd:element name="tagValue" type="tagValue" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="stereotype" type="stereotype" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="optional"/> <xsd:attribute name="visibility" type="xsd:string" use="optional"/> @@ -97,10 +107,13 @@ <xsd:attribute name="navigable" type="xsd:boolean" use="optional"/> <xsd:attribute name="ordering" type="xsd:string" use="optional"/> <xsd:attribute name="defaultValue" type="xsd:string" use="optional"/> + <xsd:attribute name="associationClassName" type="xsd:string" use="optional"/> + </xsd:complexType> <xsd:complexType name="operation"> <xsd:sequence> + <xsd:element name="stereotype" type="stereotype" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="returnParameter" type="returnParameter" minOccurs="1" maxOccurs="1"/> <xsd:element name="exceptionParameter" type="exceptionParameter" minOccurs="0" maxOccurs="unbounded"/> @@ -124,6 +137,11 @@ <xsd:attribute name="type" type="xsd:string" use="required"/> </xsd:complexType> + <xsd:complexType name="participant"> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="attribute" type="xsd:string" use="required"/> + </xsd:complexType> + <xsd:complexType name="enumeration"> <xsd:complexContent> <xsd:extension base="classifier">

1 0

r1007 - trunk/src/site/rst
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 01:28:37 +0100 (Sun, 28 Nov 2010) New Revision: 1007 Url: http://nuiton.org/repositories/revision/eugene/1007 Log: add faq to update objectmodel Modified: trunk/src/site/rst/08-FAQ.rst Modified: trunk/src/site/rst/08-FAQ.rst =================================================================== --- trunk/src/site/rst/08-FAQ.rst 2010-11-28 00:28:23 UTC (rev 1006) +++ trunk/src/site/rst/08-FAQ.rst 2010-11-28 00:28:37 UTC (rev 1007) @@ -39,6 +39,12 @@ The diagrams are not converted, you have to create them agein from the classes doing drag&drop. +Howto update object model ? +=========================== + +When updating obecject model, think to update also the associated xsd to +generate always a valid xml object model files. + How to write Transformer's methods ? ====================================

1 0

r1006 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object
by tchemit＠users.nuiton.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 01:28:23 +0100 (Sun, 28 Nov 2010) New Revision: 1006 Url: http://nuiton.org/repositories/revision/eugene/1006 Log: let the tag-value as before accepting all model tag values Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-27 23:26:43 UTC (rev 1005) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2010-11-28 00:28:23 UTC (rev 1006) @@ -99,8 +99,8 @@ * * @since 2.2.1 */ - protected Pattern modelTagValuePattern = Pattern - .compile("^model\\.(?:(tagvalue|tagValue)?)\\.((?:[_a-zA-Z0-9]+)(?:\\.[_a-zA-Z0-9]+)*)$"); + protected Pattern modelTagValuePattern = Pattern.compile( + "^model\\.(?:(tagvalue|tagValue)?)\\.((?:.+))$"); public static final String MODEL = "model";

1 0