Author: thimel Date: 2009-04-21 16:05:19 +0000 (Tue, 21 Apr 2009) New Revision: 478 Added: eugene/trunk/src/main/java/org/nuiton/ eugene/trunk/src/test/java/org/nuiton/ Removed: eugene/trunk/src/main/java/org/codelutin/ eugene/trunk/src/test/java/org/codelutin/ Modified: eugene/trunk/pom.xml eugene/trunk/src/main/java/org/nuiton/eugene/AbstractObjectModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/Generator.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorException.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/PackageValidator.java eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/Model.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModel.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelState.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModel.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelArguments.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelChild.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelConstraint.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelEvent.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelObject.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelProperty.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelArgumentsImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelChildImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelConstraintImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelEventImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelObjectImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelPropertyImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParser.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/DigesterUIModelRuleSet.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelArgumentsImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelChildImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelConstraintImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelEventImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelObjectImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelPropertyImpl.java eugene/trunk/src/main/java/org/nuiton/eugene/package-info.java eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl eugene/trunk/src/main/xsl/xmi1.2ToStateModel.xsl eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java eugene/trunk/src/test/resources/log4j.properties eugene/trunk/src/test/resources/models/objectmodel/security1.objectmodel eugene/trunk/src/test/resources/models/objectmodel/security2.objectmodel eugene/trunk/src/test/resources/models/objectmodel/security3.objectmodel eugene/trunk/src/test/resources/models/objectmodel/security4.objectmodel eugene/trunk/src/test/resources/models/objectmodel/security5.objectmodel eugene/trunk/src/test/resources/models/objectmodel/security6.objectmodel eugene/trunk/src/test/resources/xmi/2.1/TestXMI21.uml Log: Moved eugene from org.codelutin to org.nuiton Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/pom.xml 2009-04-21 16:05:19 UTC (rev 478) @@ -12,6 +12,7 @@ <version>3.4</version> </parent> + <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> <version>1.0.0-SNAPSHOT</version> Copied: eugene/trunk/src/main/java/org/nuiton (from rev 477, eugene/trunk/src/main/java/org/codelutin) Property changes on: eugene/trunk/src/main/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: eugene/trunk/src/main/java/org/nuiton/eugene/AbstractObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/AbstractObjectModelGenerator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/AbstractObjectModelGenerator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; -import org.codelutin.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelElement; /** * AbstractObjectModelGenerator. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/ChildGenerator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ChildGenerator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; /** * ChildGenerator. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/Generator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/Generator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/Generator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.io.FileOutputStream; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorException.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorException.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorException.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; /** * GeneratorException. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorTask.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorTask.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.io.FileInputStream; @@ -58,7 +58,7 @@ * Exemple d'utilisation dans ant : * * <pre> - * <taskdef name="generator" classname="org.codelutin.generator.GeneratorTask" + * <taskdef name="generator" classname="org.nuiton.eugene.GeneratorTask" * classpath="${compile.classpath}:${targetbuild}:${resources}" /> * * <target name="generate" depends="pre-compile" description="generate"> Modified: eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorUtil.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/GeneratorUtil.java 2009-04-21 16:05:19 UTC (rev 478) @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.util.ArrayList; @@ -25,12 +25,12 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelOperation; -import org.codelutin.eugene.models.object.ObjectModelParameter; +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.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; /** * GeneratorUtil. @@ -46,9 +46,9 @@ /** * return parent package of given package (return given package if it is a root package) - * eg : org.codelutin.generator.models -> org.codelutin.generator + * eg : org.nuiton.eugene.models -> org.nuiton.eugene * eg : org -> org - * warning : org.codelutin.generator. -> org.codelutin.generator + * warning : org.nuiton.eugene. -> org.nuiton.eugene * * @param packageName package * @return parent package of given package @@ -64,7 +64,7 @@ /** * return class name fr given fully qualified name (return given name if it is not fully qualified) - * eg : org.codelutin.generator.models.ObjectClass -> ObjectClass + * eg : org.nuiton.eugene.models.ObjectClass -> ObjectClass * eg : ObjectClass-> ObjectClass */ public static String getClassNameFromQualifiedName(String qualifiedName) { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/MonitorWriter.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/MonitorWriter.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.FilterWriter; import java.io.IOException; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/ObjectModelGenerator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/ObjectModelGenerator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.io.FileInputStream; @@ -31,17 +31,17 @@ import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelElement; -import org.codelutin.eugene.models.object.ObjectModelInterface; -import org.codelutin.eugene.models.object.xml.DigesterObjectModelRuleSet; -import org.codelutin.eugene.models.object.xml.ObjectModelClassifierImpl; -import org.codelutin.eugene.models.object.xml.ObjectModelElementImpl; -import org.codelutin.eugene.models.object.xml.ObjectModelImpl; -import org.codelutin.eugene.models.object.xml.ObjectModelImplRef; -import org.codelutin.eugene.models.object.xml.ObjectModelImplTagValue; +import org.nuiton.eugene.models.object.ObjectModel; +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.ObjectModelInterface; +import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; +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.codelutin.util.FileUtil; import org.codelutin.util.RecursiveProperties; import org.codelutin.util.StringUtil; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/PackageValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/PackageValidator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/PackageValidator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; /** * The PackageValidator class is used by the xmi1.2ToObjectModel.xsl Modified: eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/StateModelGenerator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/StateModelGenerator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.io.FileInputStream; @@ -27,11 +27,11 @@ import org.apache.commons.digester.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.eugene.models.state.StateModel; -import org.codelutin.eugene.models.state.StateModelState; -import org.codelutin.eugene.models.state.StateModelStateChart; -import org.codelutin.eugene.models.state.xml.DigesterStateModelRuleSet; -import org.codelutin.eugene.models.state.xml.StateModelImpl; +import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.models.state.StateModelState; +import org.nuiton.eugene.models.state.StateModelStateChart; +import org.nuiton.eugene.models.state.xml.DigesterStateModelRuleSet; +import org.nuiton.eugene.models.state.xml.StateModelImpl; import org.codelutin.util.FileUtil; import org.codelutin.util.RecursiveProperties; import org.xml.sax.SAXException; @@ -85,7 +85,7 @@ } /* - * @see org.codelutin.generator.Generator#generate(java.io.File[], java.io.File) + * @see org.nuiton.eugene.Generator#generate(java.io.File[], java.io.File) */ @Override public void generate(File[] files, File destDir) { @@ -164,7 +164,7 @@ } /** - * Par défaut, appel {@link #generateFromModel(MonitorWriter, org.codelutin.generator.models.state.StateModel)} pour le + * Par défaut, appel {@link #generateFromModel(MonitorWriter, org.nuiton.eugene.models.state.StateModel)} pour le * model et {@link #generateFromState(Writer,StateModelState)} pour tous les * etats du modele. * Modified: eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/UIModelGenerator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/UIModelGenerator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.eugene; +package org.nuiton.eugene; import java.io.File; import java.io.IOException; @@ -27,11 +27,11 @@ import java.util.logging.Logger; import org.apache.commons.digester.Digester; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.UIModelObject; -import org.codelutin.eugene.models.ui.UIModelProperty; -import org.codelutin.eugene.models.ui.impl.UIModelImpl; -import org.codelutin.eugene.models.ui.javaxml.JavaXMLParser; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.models.ui.impl.UIModelImpl; +import org.nuiton.eugene.models.ui.javaxml.JavaXMLParser; import org.codelutin.util.ResourceNotFoundException; import org.dom4j.DocumentException; import org.xml.sax.SAXException; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/Model.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/Model.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/Model.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models; +package org.nuiton.eugene.models; import java.util.Map; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModel.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModel.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.Collection; import java.util.List; -import org.codelutin.eugene.models.Model; +import org.nuiton.eugene.models.Model; /** * Abstraction for the root node of object model trees. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAssociationClass.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAssociationClass.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.List; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAttribute.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; /** * Abstraction for the attribute node of object model trees. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClass.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClass.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClassifier.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelClassifier.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelElement.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelElement.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.Collection; import java.util.List; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelInterface.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelInterface.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; /** * Abstraction for the interface node of object model trees. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelOperation.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; import java.util.Collection; import java.util.Set; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelParameter.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object; +package org.nuiton.eugene.models.object; /** * Abstraction for the parameter node of object model trees. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/AttributeNamesValidator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/AttributeNamesValidator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,10 +17,10 @@ -package org.codelutin.eugene.models.object.validator; +package org.nuiton.eugene.models.object.validator; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; /** * AttributeNamesValidator. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ClassNamesValidator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ClassNamesValidator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,10 +15,10 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.validator; +package org.nuiton.eugene.models.object.validator; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; /** * ClassNamesValidator. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/NameBasedValidator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/NameBasedValidator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,12 +17,12 @@ -package org.codelutin.eugene.models.object.validator; +package org.nuiton.eugene.models.object.validator; import java.util.HashMap; import java.util.Map; -import org.codelutin.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModel; /** * NameBasedValidator. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ObjectModelValidator.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/validator/ObjectModelValidator.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,19 +15,19 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.validator; +package org.nuiton.eugene.models.object.validator; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelElement; -import org.codelutin.eugene.models.object.ObjectModelInterface; -import org.codelutin.eugene.models.object.ObjectModelOperation; +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.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; /** * <p> Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; -import org.codelutin.eugene.GeneratorUtil; +import org.nuiton.eugene.GeneratorUtil; /** * ObjectModeImplAssociationClassParticipant. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAssociationClassImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAssociationClassImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -25,10 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.eugene.models.object.ObjectModelAssociationClass; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; /** * ObjectModelAssociationClassImpl.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAttributeImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelAttributeImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; -import org.codelutin.eugene.GeneratorUtil; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; /** * ObjectModelAttributeImpl. @@ -196,7 +196,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.generator.models.object.ObjectModelAttribute#getReverseMaxMultiplicity() + * @see org.nuiton.eugene.models.object.ObjectModelAttribute#getReverseMaxMultiplicity() */ public int getReverseMaxMultiplicity() { return reverseMaxMultiplicity; @@ -243,14 +243,14 @@ } /* - * @see org.codelutin.generator.models.object.ObjectModelAttribute#isNavigable() + * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isNavigable() */ public boolean isNavigable() { return isNavigable; } /* - * @see org.codelutin.generator.models.object.ObjectModelAttribute#isOrdered() + * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isOrdered() */ public boolean isOrdered() { return isIndexed() || "ordered".equals(ordering) @@ -258,7 +258,7 @@ } /* - * @see org.codelutin.generator.models.object.ObjectModelAttribute#isIndexed() + * @see org.nuiton.eugene.models.object.ObjectModelAttribute#isIndexed() */ public boolean isIndexed() { return hasStereotype("indexed"); Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -26,11 +26,11 @@ import java.util.List; import java.util.Map; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelInterface; -import org.codelutin.eugene.models.object.ObjectModelOperation; +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.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; /** * ObjectModelClassImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassifierImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelClassifierImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -24,9 +24,9 @@ import java.util.LinkedList; import java.util.List; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelInterface; -import org.codelutin.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; /** * ObjectModelClassifierImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelElementImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelElementImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelElement; /** * ObjectModelElementImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -24,11 +24,11 @@ import java.util.List; import java.util.Map; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelInterface; +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.ObjectModelInterface; /** * Implementation class for the root node abstraction of object model trees. @@ -195,7 +195,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.generator.models.object.ObjectModel#hasClass(java.lang.String) + * @see org.nuiton.eugene.models.object.ObjectModel#hasClass(java.lang.String) */ public boolean hasClass(String qualifiedClassName) { boolean hasClass = classes.containsKey(qualifiedClassName); Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplRef.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplRef.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; /** * ObjectModelImplRef. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplSuperClassRef.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplSuperClassRef.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; /** * ObjectModelImplRef. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplTagValue.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImplTagValue.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; /** * ObjectModelImplTagValue.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelInterfaceImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelInterfaceImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.Iterator; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelClassifier; -import org.codelutin.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; /** * ObjectModelInterfaceImpl.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; import java.util.ArrayList; import java.util.Collection; @@ -24,8 +24,8 @@ import java.util.List; import java.util.Set; -import org.codelutin.eugene.models.object.ObjectModelOperation; -import org.codelutin.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; /** * ObjectModelOperationImpl.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelParameterImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.object.xml; +package org.nuiton.eugene.models.object.xml; -import org.codelutin.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.models.object.ObjectModelParameter; /** * ObjectModelParameterImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModel.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModel.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,11 +15,11 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; import java.util.List; -import org.codelutin.eugene.models.Model; +import org.nuiton.eugene.models.Model; /** * StateModel Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelComplexState.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelComplexState.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelSimpleState.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelSimpleState.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; /** * StateModelSimpleState Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelState.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelState.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; import java.util.List; @@ -24,8 +24,8 @@ * * A state, that can be simple or complexe * - * @see org.codelutin.generator.models.state.StateModelSimpleState - * @see org.codelutin.generator.models.state.StateModelComplexState + * @see org.nuiton.eugene.models.state.StateModelSimpleState + * @see org.nuiton.eugene.models.state.StateModelComplexState * * @author chatellier * @version $Revision$ Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelStateChart.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelStateChart.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; /** * StateModelStateChart Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelTransition.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/StateModelTransition.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; /** * StateModelTransition Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/DigesterStateModelRuleSet.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelComplexeStateImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelComplexeStateImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,17 +15,17 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.codelutin.eugene.models.state.StateModelComplexState; -import org.codelutin.eugene.models.state.StateModelSimpleState; -import org.codelutin.eugene.models.state.StateModelState; -import org.codelutin.eugene.models.state.StateModelTransition; +import org.nuiton.eugene.models.state.StateModelComplexState; +import org.nuiton.eugene.models.state.StateModelSimpleState; +import org.nuiton.eugene.models.state.StateModelState; +import org.nuiton.eugene.models.state.StateModelTransition; /** * StateModelComplexeStateImpl.java @@ -61,7 +61,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelComplexeState#getStates() + * @see org.nuiton.eugene.models.state.StateModelComplexeState#getStates() */ public Collection<StateModelState> getStates() { return mapState.values(); @@ -111,7 +111,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.xml.StateModelStateImpl#isComplexe() + * @see org.nuiton.eugene.models.state.xml.StateModelStateImpl#isComplexe() */ @Override public boolean isComplex() { @@ -120,7 +120,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelComplexeState#getInitialState() + * @see org.nuiton.eugene.models.state.StateModelComplexeState#getInitialState() */ public StateModelState getInitialState() { Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; import java.util.ArrayList; import java.util.Collection; @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import org.codelutin.eugene.models.state.StateModel; -import org.codelutin.eugene.models.state.StateModelStateChart; +import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.models.state.StateModelStateChart; /** * StateModelImpl.java @@ -62,7 +62,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModel#getName() + * @see org.nuiton.eugene.models.state.StateModel#getName() */ public String getName() { return this.name; @@ -91,7 +91,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModel#getStateCharts() + * @see org.nuiton.eugene.models.state.StateModel#getStateCharts() */ public List<StateModelStateChart> getStateCharts() { return listStateCharts; @@ -106,7 +106,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModel#getTagValues() + * @see org.nuiton.eugene.models.state.StateModel#getTagValues() */ public Map<String, String> getTagValues() { return modelTagValues; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelSimpleStateImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelSimpleStateImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; -import org.codelutin.eugene.models.state.StateModelSimpleState; +import org.nuiton.eugene.models.state.StateModelSimpleState; /** * StateModelSimpleStateImpl.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateChartImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateChartImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; -import org.codelutin.eugene.models.state.StateModelStateChart; +import org.nuiton.eugene.models.state.StateModelStateChart; /** * StateModelStateChartImpl.java @@ -37,7 +37,7 @@ protected String packageName; /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelStateChart#getPackageName() + * @see org.nuiton.eugene.models.state.StateModelStateChart#getPackageName() */ public String getPackageName() { return packageName; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelStateImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; import java.util.ArrayList; import java.util.List; -import org.codelutin.eugene.models.state.StateModelState; -import org.codelutin.eugene.models.state.StateModelTransition; +import org.nuiton.eugene.models.state.StateModelState; +import org.nuiton.eugene.models.state.StateModelTransition; /** * StateModelStateImpl.java @@ -62,7 +62,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelState#getName() + * @see org.nuiton.eugene.models.state.StateModelState#getName() */ public String getName() { return name; @@ -85,28 +85,28 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelState#getTransitions() + * @see org.nuiton.eugene.models.state.StateModelState#getTransitions() */ public List<StateModelTransition> getTransitions() { return listTransitions; } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelState#isComplexe() + * @see org.nuiton.eugene.models.state.StateModelState#isComplexe() */ public boolean isComplex() { return false; } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelState#isFinal() + * @see org.nuiton.eugene.models.state.StateModelState#isFinal() */ public boolean isFinal() { return false; } /* (non-Javadoc) - * @see org.codelutin.generator.models.state.StateModelState#isInitial() + * @see org.nuiton.eugene.models.state.StateModelState#isInitial() */ public boolean isInitial() { return false; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelTransitionImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/state/xml/StateModelTransitionImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,10 +15,10 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state.xml; +package org.nuiton.eugene.models.state.xml; -import org.codelutin.eugene.models.state.StateModelState; -import org.codelutin.eugene.models.state.StateModelTransition; +import org.nuiton.eugene.models.state.StateModelState; +import org.nuiton.eugene.models.state.StateModelTransition; /** * StateModelTransitionImpl @@ -81,14 +81,14 @@ } /* - * @see org.codelutin.generator.models.state.StateModelTransition#getDestinationState() + * @see org.nuiton.eugene.models.state.StateModelTransition#getDestinationState() */ public StateModelState getDestinationState() { return state; } /* - * @see org.codelutin.generator.models.state.StateModelTransition#getEvent() + * @see org.nuiton.eugene.models.state.StateModelTransition#getEvent() */ public String getEvent() { return event; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModel.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModel.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelArguments.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelArguments.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelArguments.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; import java.util.List; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelChild.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelChild.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelChild.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,7 +17,7 @@ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; /** * UIModelChild. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelConstraint.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelConstraint.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelConstraint.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; /** * UIModelConstraint. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelEvent.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelEvent.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelEvent.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; /** * UIModelEvent. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelObject.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelObject.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelObject.java 2009-04-21 16:05:19 UTC (rev 478) @@ -14,7 +14,7 @@ * 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>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelProperty.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelProperty.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/UIModelProperty.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui; +package org.nuiton.eugene.models.ui; /** * UIModelProperty.java Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelArgumentsImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelArgumentsImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelArgumentsImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.codelutin.eugene.models.ui.UIModelArguments; +import org.nuiton.eugene.models.ui.UIModelArguments; /** * UIModelArgumentsImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelChildImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelChildImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelChildImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,11 +17,11 @@ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; -import org.codelutin.eugene.models.ui.UIModelChild; -import org.codelutin.eugene.models.ui.UIModelConstraint; -import org.codelutin.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelChild; +import org.nuiton.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelObject; /** * UIModelChildImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelConstraintImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelConstraintImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelConstraintImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,9 +17,9 @@ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; -import org.codelutin.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelConstraint; /** * UIModelConstraintImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelEventImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelEventImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelEventImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,9 +17,9 @@ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; -import org.codelutin.eugene.models.ui.UIModelEvent; +import org.nuiton.eugene.models.ui.UIModelEvent; /** * UIModelEventImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,14 +17,14 @@ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.UIModelObject; /** * UIModelImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelObjectImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelObjectImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelObjectImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,20 +15,20 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.UIModelArguments; -import org.codelutin.eugene.models.ui.UIModelChild; -import org.codelutin.eugene.models.ui.UIModelConstraint; -import org.codelutin.eugene.models.ui.UIModelEvent; -import org.codelutin.eugene.models.ui.UIModelObject; -import org.codelutin.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.UIModelArguments; +import org.nuiton.eugene.models.ui.UIModelChild; +import org.nuiton.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelEvent; +import org.nuiton.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelProperty; /** * UIModelObjectImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelPropertyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelPropertyImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/impl/UIModelPropertyImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,10 +17,10 @@ -package org.codelutin.eugene.models.ui.impl; +package org.nuiton.eugene.models.ui.impl; -import org.codelutin.eugene.GeneratorException; -import org.codelutin.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.GeneratorException; +import org.nuiton.eugene.models.ui.UIModelProperty; /** * UIModelPropertyImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParser.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParser.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParser.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.javaxml; +package org.nuiton.eugene.models.ui.javaxml; import java.io.File; import java.net.MalformedURLException; @@ -24,16 +24,16 @@ import java.util.Iterator; import java.util.List; -import org.codelutin.eugene.models.ui.UIModelEvent; -import org.codelutin.eugene.models.ui.UIModelObject; -import org.codelutin.eugene.models.ui.UIModelProperty; -import org.codelutin.eugene.models.ui.impl.UIModelArgumentsImpl; -import org.codelutin.eugene.models.ui.impl.UIModelChildImpl; -import org.codelutin.eugene.models.ui.impl.UIModelConstraintImpl; -import org.codelutin.eugene.models.ui.impl.UIModelEventImpl; -import org.codelutin.eugene.models.ui.impl.UIModelImpl; -import org.codelutin.eugene.models.ui.impl.UIModelObjectImpl; -import org.codelutin.eugene.models.ui.impl.UIModelPropertyImpl; +import org.nuiton.eugene.models.ui.UIModelEvent; +import org.nuiton.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.models.ui.impl.UIModelArgumentsImpl; +import org.nuiton.eugene.models.ui.impl.UIModelChildImpl; +import org.nuiton.eugene.models.ui.impl.UIModelConstraintImpl; +import org.nuiton.eugene.models.ui.impl.UIModelEventImpl; +import org.nuiton.eugene.models.ui.impl.UIModelImpl; +import org.nuiton.eugene.models.ui.impl.UIModelObjectImpl; +import org.nuiton.eugene.models.ui.impl.UIModelPropertyImpl; import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/DigesterUIModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/DigesterUIModelRuleSet.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/DigesterUIModelRuleSet.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelArgumentsImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelArgumentsImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelArgumentsImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,13 +17,13 @@ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; import java.util.ArrayList; import java.util.List; -import org.codelutin.eugene.models.ui.UIModelArguments; -import org.codelutin.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelArguments; +import org.nuiton.eugene.models.ui.UIModelObject; /** * UIModelArgumentsImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelChildImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelChildImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelChildImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,11 +17,11 @@ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; -import org.codelutin.eugene.models.ui.UIModelChild; -import org.codelutin.eugene.models.ui.UIModelConstraint; -import org.codelutin.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelChild; +import org.nuiton.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelObject; /** * UIModelChildImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelConstraintImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelConstraintImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelConstraintImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; -import org.codelutin.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelConstraint; /** * UIModelConstraintImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelEventImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelEventImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelEventImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,9 +17,9 @@ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; -import org.codelutin.eugene.models.ui.UIModelEvent; +import org.nuiton.eugene.models.ui.UIModelEvent; /** * UIModelEventImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,14 +15,14 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.UIModelObject; /** * UIModelImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelObjectImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelObjectImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelObjectImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,18 +15,18 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.UIModelChild; -import org.codelutin.eugene.models.ui.UIModelConstraint; -import org.codelutin.eugene.models.ui.UIModelEvent; -import org.codelutin.eugene.models.ui.UIModelObject; -import org.codelutin.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.UIModelChild; +import org.nuiton.eugene.models.ui.UIModelConstraint; +import org.nuiton.eugene.models.ui.UIModelEvent; +import org.nuiton.eugene.models.ui.UIModelObject; +import org.nuiton.eugene.models.ui.UIModelProperty; /** * UIModelObjectImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelPropertyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelPropertyImpl.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/models/ui/xml/UIModelPropertyImpl.java 2009-04-21 16:05:19 UTC (rev 478) @@ -17,9 +17,9 @@ -package org.codelutin.eugene.models.ui.xml; +package org.nuiton.eugene.models.ui.xml; -import org.codelutin.eugene.models.ui.UIModelProperty; +import org.nuiton.eugene.models.ui.UIModelProperty; /** * UIModelPropertyImpl. Modified: eugene/trunk/src/main/java/org/nuiton/eugene/package-info.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/package-info.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/java/org/nuiton/eugene/package-info.java 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ /** * Lutin Generator. */ -package org.codelutin.eugene; +package org.nuiton.eugene; Modified: eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-04-21 16:05:19 UTC (rev 478) @@ -5,7 +5,7 @@ xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" xmlns="http://www.codelutin.org/eugene/objectModel" - xmlns:packageValidator="xalan://org.codelutin.eugene.PackageValidator" + xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns:UML="org.omg.xmi.namespace.UML" xmlns:UML2="org.omg.xmi.namespace.UML2"> <xsl:output method="xml" Modified: eugene/trunk/src/main/xsl/xmi1.2ToStateModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi1.2ToStateModel.xsl 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/xsl/xmi1.2ToStateModel.xsl 2009-04-21 16:05:19 UTC (rev 478) @@ -6,7 +6,7 @@ xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" xmlns="http://www.codelutin.org/eugene/stateModel" - xmlns:packageValidator="xalan://org.codelutin.eugene.PackageValidator" + xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns:UML="org.omg.xmi.namespace.UML" xmlns:UML2="org.omg.xmi.namespace.UML2"> Modified: eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-04-21 16:05:19 UTC (rev 478) @@ -4,7 +4,7 @@ xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" xmlns="http://www.codelutin.org/eugene/objectModel" - xmlns:packageValidator="xalan://org.codelutin.eugene.PackageValidator" + xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML"> <xsl:output method="xml" encoding="UTF-8" indent="yes" Copied: eugene/trunk/src/test/java/org/nuiton (from rev 477, eugene/trunk/src/test/java/org/codelutin) Property changes on: eugene/trunk/src/test/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelDTDTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelDTDTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; import java.io.File; import java.io.FileInputStream; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/state/StateModelTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.state; +package org.nuiton.eugene.models.state; import java.io.File; import java.net.URISyntaxException; @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.eugene.StateModelGenerator; +import org.nuiton.eugene.StateModelGenerator; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,15 +15,15 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.ui.javaxml; +package org.nuiton.eugene.models.ui.javaxml; import java.io.File; import java.util.ArrayList; -import org.codelutin.eugene.models.ui.UIModel; -import org.codelutin.eugene.models.ui.impl.UIModelChildImpl; -import org.codelutin.eugene.models.ui.impl.UIModelEventImpl; -import org.codelutin.eugene.models.ui.impl.UIModelObjectImpl; +import org.nuiton.eugene.models.ui.UIModel; +import org.nuiton.eugene.models.ui.impl.UIModelChildImpl; +import org.nuiton.eugene.models.ui.impl.UIModelEventImpl; +import org.nuiton.eugene.models.ui.impl.UIModelObjectImpl; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/xml/ModelMergeTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/models/xml/ModelMergeTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,15 +15,15 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.models.xml; +package org.nuiton.eugene.models.xml; import java.io.File; import java.net.URISyntaxException; import java.net.URL; -import org.codelutin.eugene.ObjectModelGenerator; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; import org.codelutin.util.Resource; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.eugene.xmi.objectmodel; +package org.nuiton.eugene.xmi.objectmodel; import java.io.File; import java.io.FileOutputStream; @@ -30,9 +30,9 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.codelutin.eugene.ObjectModelGenerator; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.xmi.util.ResourceResolver; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.xmi.util.ResourceResolver; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-04-21 16:05:19 UTC (rev 478) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.eugene.xmi.objectmodel; +package org.nuiton.eugene.xmi.objectmodel; import java.io.File; import java.io.FileOutputStream; @@ -32,13 +32,13 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.codelutin.eugene.ObjectModelGenerator; -import org.codelutin.eugene.models.object.ObjectModel; -import org.codelutin.eugene.models.object.ObjectModelAttribute; -import org.codelutin.eugene.models.object.ObjectModelClass; -import org.codelutin.eugene.models.object.ObjectModelOperation; -import org.codelutin.eugene.models.object.ObjectModelParameter; -import org.codelutin.eugene.xmi.util.ResourceResolver; +import org.nuiton.eugene.ObjectModelGenerator; +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.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.xmi.util.ResourceResolver; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; @@ -143,7 +143,7 @@ Assert.assertEquals(11, model.getClassifiers().size()); // ClassB - ObjectModelClass clazzB = model.getClass("org.codelutin.generator.test21.ClassB"); + ObjectModelClass clazzB = model.getClass("org.nuiton.eugene.test21.ClassB"); Assert.assertNotNull(clazzB); ObjectModelAttribute attrCost = clazzB.getAttribute("cost"); Assert.assertNotNull(attrCost); Modified: eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/util/ResourceResolver.java 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/java/org/nuiton/eugene/xmi/util/ResourceResolver.java 2009-04-21 16:05:19 UTC (rev 478) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.eugene.xmi.util; +package org.nuiton.eugene.xmi.util; import java.net.URL; import java.net.URLClassLoader; Modified: eugene/trunk/src/test/resources/log4j.properties =================================================================== --- eugene/trunk/src/test/resources/log4j.properties 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/log4j.properties 2009-04-21 16:05:19 UTC (rev 478) @@ -7,5 +7,5 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.codelutin.generator=DEBUG +log4j.logger.org.nuiton.eugene=DEBUG log4j.logger.org.apache.commons.digester=INFO \ No newline at end of file Modified: eugene/trunk/src/test/resources/models/objectmodel/security1.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security1.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security1.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> </interface> Modified: eugene/trunk/src/test/resources/models/objectmodel/security2.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security2.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security2.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> <attribute name="nom" visibility="private" type="java.lang.String"/> Modified: eugene/trunk/src/test/resources/models/objectmodel/security3.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security3.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security3.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="User" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> <attribute name="password" visibility="private" type="java.lang.String"/> Modified: eugene/trunk/src/test/resources/models/objectmodel/security4.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security4.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security4.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="ZimZoum" package="org.codelutin.topia.security"> <stereotype name="entity"/> </interface> Modified: eugene/trunk/src/test/resources/models/objectmodel/security5.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security5.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security5.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <class name="RolePermission" package="org.codelutin.topia.security.entities"> <stereotype name="entity"/> <attribute name="topiaId" visibility="private" type="java.lang.String"/> Modified: eugene/trunk/src/test/resources/models/objectmodel/security6.objectmodel =================================================================== --- eugene/trunk/src/test/resources/models/objectmodel/security6.objectmodel 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/models/objectmodel/security6.objectmodel 2009-04-21 16:05:19 UTC (rev 478) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> +<objectModel xmlns:UML="org.omg.xmi.namespace.UML" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns="http://www.codelutin.org/lutingenerator/objectModel" name="Security"> <interface name="TestInterface" package="org.codelutin.topia.security"> <stereotype name="entity"/> </interface> Modified: eugene/trunk/src/test/resources/xmi/2.1/TestXMI21.uml =================================================================== --- eugene/trunk/src/test/resources/xmi/2.1/TestXMI21.uml 2009-04-09 12:42:13 UTC (rev 477) +++ eugene/trunk/src/test/resources/xmi/2.1/TestXMI21.uml 2009-04-21 16:05:19 UTC (rev 478) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:AcceleoBusiness="http:///schemas/AcceleoBusiness/_my2ZAHXaEd2S2Y-Jnv-fiQ/2" xmlns:Sharengoserviceprofile="http:///schemas/Sharengoserviceprofile/_bMLXQKEQEd2L7a68DRX6Bg/1" xmlns:Sharengoserviceprofile_1="http:///schemas/Sharengoserviceprofile/_pCa5EPQ4Ed2_aZMAEjWDNQ/2" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xsi:schemaLocation="http:///schemas/AcceleoBusiness/_my2ZAHXaEd2S2Y-Jnv-fiQ/2 pathmap://ACCELEO_PROFILES/Acceleo.Business.profile.uml#_81g14fWcEdyuYMHNZCqWBQ http:///schemas/Sharengoserviceprofile/_bMLXQKEQEd2L7a68DRX6Bg/1 pathmap://SHARENGO_PROFILES/Sharengo.service.profile.uml#_bMLXQaEQEd2L7a68DRX6Bg http:///schemas/Sharengoserviceprofile/_pCa5EPQ4Ed2_aZMAEjWDNQ/2 pathmap://SHARENGO_PROFILES/Sharengo.service.profile.uml#_pCbgIPQ4Ed2_aZMAEjWDNQ"> <uml:Model xmi:id="_qb8akM37EdqwVrslYOdUDA" name="XMITest21"> - <packagedElement xmi:type="uml:Package" xmi:id="_w8IxIM37EdqwVrslYOdUDA" name="org.codelutin.generator.test21"> + <packagedElement xmi:type="uml:Package" xmi:id="_w8IxIM37EdqwVrslYOdUDA" name="org.nuiton.eugene.test21"> <packagedElement xmi:type="uml:Class" xmi:id="_NNUyUP58Ed2zEeRO-8Et9Q" name="ClassA" clientDependency="_X7ZekP58Ed2zEeRO-8Et9Q _YbeFwf58Ed2zEeRO-8Et9Q" isAbstract="true"> <ownedAttribute xmi:id="_OkwfUP58Ed2zEeRO-8Et9Q" name="name"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>