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

March 6, 2009

Author: nrannou Date: 2009-03-06 16:58:59 +0000 (Fri, 06 Mar 2009) New Revision: 471 Modified: eugene/trunk/pom.xml eugene/trunk/src/main/java/org/codelutin/eugene/AbstractObjectModelGenerator.java eugene/trunk/src/main/java/org/codelutin/eugene/ChildGenerator.java eugene/trunk/src/main/java/org/codelutin/eugene/Generator.java eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorException.java eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorTask.java eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorUtil.java eugene/trunk/src/main/java/org/codelutin/eugene/MonitorWriter.java eugene/trunk/src/main/java/org/codelutin/eugene/ObjectModelGenerator.java eugene/trunk/src/main/java/org/codelutin/eugene/PackageValidator.java eugene/trunk/src/main/java/org/codelutin/eugene/StateModelGenerator.java eugene/trunk/src/main/java/org/codelutin/eugene/UIModelGenerator.java eugene/trunk/src/main/java/org/codelutin/eugene/models/Model.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModel.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAssociationClass.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAttribute.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClass.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClassifier.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelElement.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelInterface.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelOperation.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelParameter.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/AttributeNamesValidator.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ClassNamesValidator.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/NameBasedValidator.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ObjectModelValidator.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/DigesterObjectModelRuleSet.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAssociationClassImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAttributeImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassifierImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelElementImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplRef.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplSuperClassRef.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplTagValue.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelInterfaceImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelOperationImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelParameterImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModel.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelComplexState.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelSimpleState.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelState.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelStateChart.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelTransition.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/DigesterStateModelRuleSet.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelComplexeStateImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelSimpleStateImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateChartImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelTransitionImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModel.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelArguments.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelChild.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelConstraint.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelEvent.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelObject.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelProperty.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelArgumentsImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelChildImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelConstraintImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelEventImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelObjectImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelPropertyImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParser.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/DigesterUIModelRuleSet.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelArgumentsImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelChildImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelConstraintImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelEventImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelObjectImpl.java eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelPropertyImpl.java eugene/trunk/src/main/java/org/codelutin/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/codelutin/eugene/models/state/StateModelDTDTest.java eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelTest.java eugene/trunk/src/test/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParserTest.java eugene/trunk/src/test/java/org/codelutin/eugene/models/xml/ModelMergeTest.java eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java eugene/trunk/src/test/java/org/codelutin/eugene/xmi/util/ResourceResolver.java Log: Modification des imports apres renommage du projet Modified: eugene/trunk/pom.xml =================================================================== --- eugene/trunk/pom.xml 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/pom.xml 2009-03-06 16:58:59 UTC (rev 471) @@ -12,8 +12,8 @@ <version>3.4</version> </parent> - <artifactId>lutingenerator</artifactId> - <version>0.65-SNAPSHOT</version> + <artifactId>eugene</artifactId> + <version>1.0.0-SNAPSHOT</version>  <dependencies> @@ -88,9 +88,9 @@    - <name>Lutin Generator</name> + <name>Eugene</name> - <description>Générateurs en tout genre.</description> + <description>Efficient Universal Generator.</description> <inceptionYear>2004</inceptionYear>  Modified: eugene/trunk/src/main/java/org/codelutin/eugene/AbstractObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/AbstractObjectModelGenerator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/AbstractObjectModelGenerator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; -import org.codelutin.generator.models.object.ObjectModelElement; +import org.codelutin.eugene.models.object.ObjectModelElement; /** * AbstractObjectModelGenerator. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/ChildGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/ChildGenerator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/ChildGenerator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; /** * ChildGenerator. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/Generator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/Generator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/Generator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -16,11 +16,8 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.generator; +package org.codelutin.eugene; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -29,6 +26,9 @@ import java.util.List; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * Generator. * Modified: eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorException.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorException.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorException.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; /** * GeneratorException. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorTask.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorTask.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorTask.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; import java.io.File; import java.io.FileInputStream; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorUtil.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorUtil.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/GeneratorUtil.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.generator; +package org.codelutin.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.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; +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; /** * GeneratorUtil. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/MonitorWriter.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/MonitorWriter.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/MonitorWriter.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2008 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; import java.io.FilterWriter; import java.io.IOException; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/ObjectModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/ObjectModelGenerator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/ObjectModelGenerator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,27 +15,8 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; -import org.apache.commons.digester.Digester; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelElement; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.xml.DigesterObjectModelRuleSet; -import org.codelutin.generator.models.object.xml.ObjectModelClassifierImpl; -import org.codelutin.generator.models.object.xml.ObjectModelElementImpl; -import org.codelutin.generator.models.object.xml.ObjectModelImpl; -import org.codelutin.generator.models.object.xml.ObjectModelImplRef; -import org.codelutin.generator.models.object.xml.ObjectModelImplTagValue; -import org.codelutin.util.FileUtil; -import org.codelutin.util.RecursiveProperties; -import org.codelutin.util.StringUtil; -import org.xml.sax.SAXException; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -47,6 +28,25 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +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.codelutin.util.FileUtil; +import org.codelutin.util.RecursiveProperties; +import org.codelutin.util.StringUtil; +import org.xml.sax.SAXException; + /** * Pour utiliser ce type de générateur il faut implanter au moins une des trois * méthodes generateFrom... et le getFilenameFor... associé si l'on souhaite un Modified: eugene/trunk/src/main/java/org/codelutin/eugene/PackageValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/PackageValidator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/PackageValidator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.eugene; /** * The PackageValidator class is used by the xmi1.2ToObjectModel.xsl Modified: eugene/trunk/src/main/java/org/codelutin/eugene/StateModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/StateModelGenerator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/StateModelGenerator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator; +package org.codelutin.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.generator.models.state.StateModel; -import org.codelutin.generator.models.state.StateModelState; -import org.codelutin.generator.models.state.StateModelStateChart; -import org.codelutin.generator.models.state.xml.DigesterStateModelRuleSet; -import org.codelutin.generator.models.state.xml.StateModelImpl; +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.codelutin.util.FileUtil; import org.codelutin.util.RecursiveProperties; import org.xml.sax.SAXException; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/UIModelGenerator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/UIModelGenerator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/UIModelGenerator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,5 +1,5 @@ /* - * *##% Lutin Generator + * \*##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,22 +17,21 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.generator; +package org.codelutin.eugene; import java.io.File; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import java.util.Iterator; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.digester.Digester; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.UIModelObject; -import org.codelutin.generator.models.ui.UIModelProperty; -import org.codelutin.generator.models.ui.javaxml.JavaXMLParser; -import org.codelutin.generator.models.ui.xml.UIModelImpl; +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.codelutin.util.ResourceNotFoundException; import org.dom4j.DocumentException; import org.xml.sax.SAXException; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/Model.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/Model.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/Model.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models; +package org.codelutin.eugene.models; import java.util.Map; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModel.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModel.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.Collection; import java.util.List; -import org.codelutin.generator.models.Model; +import org.codelutin.eugene.models.Model; /** * Abstraction for the root node of object model trees. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAssociationClass.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAssociationClass.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAssociationClass.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.List; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAttribute.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAttribute.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelAttribute.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; /** * Abstraction for the attribute node of object model trees. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClass.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClass.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClass.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClassifier.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClassifier.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelClassifier.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelElement.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelElement.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelElement.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.Collection; import java.util.List; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelInterface.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelInterface.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelInterface.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; /** * Abstraction for the interface node of object model trees. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelOperation.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelOperation.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelOperation.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; import java.util.Collection; import java.util.Set; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelParameter.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelParameter.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/ObjectModelParameter.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object; +package org.codelutin.eugene.models.object; /** * Abstraction for the parameter node of object model trees. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/AttributeNamesValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/AttributeNamesValidator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/AttributeNamesValidator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,10 +17,10 @@ -package org.codelutin.generator.models.object.validator; +package org.codelutin.eugene.models.object.validator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; +import org.codelutin.eugene.models.object.ObjectModel; +import org.codelutin.eugene.models.object.ObjectModelAttribute; /** * AttributeNamesValidator. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ClassNamesValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ClassNamesValidator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ClassNamesValidator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,10 +15,10 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.validator; +package org.codelutin.eugene.models.object.validator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.eugene.models.object.ObjectModel; +import org.codelutin.eugene.models.object.ObjectModelClass; /** * ClassNamesValidator. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/NameBasedValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/NameBasedValidator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/NameBasedValidator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,12 +17,12 @@ -package org.codelutin.generator.models.object.validator; +package org.codelutin.eugene.models.object.validator; import java.util.HashMap; import java.util.Map; -import org.codelutin.generator.models.object.ObjectModel; +import org.codelutin.eugene.models.object.ObjectModel; /** * NameBasedValidator. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ObjectModelValidator.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ObjectModelValidator.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/validator/ObjectModelValidator.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,19 +15,19 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.validator; +package org.codelutin.eugene.models.object.validator; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelElement; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; +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; /** * <p> Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/DigesterObjectModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModeImplAssociationClassParticipant.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; -import org.codelutin.generator.GeneratorUtil; +import org.codelutin.eugene.GeneratorUtil; /** * ObjectModeImplAssociationClassParticipant. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAssociationClassImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAssociationClassImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAssociationClassImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,5 +1,5 @@ /* - * *##% Lutin Generator + * \*##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; +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; /** * ObjectModelAssociationClassImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAttributeImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAttributeImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelAttributeImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; +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; /** * ObjectModelAttributeImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; +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; /** * ObjectModelClassImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassifierImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassifierImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelClassifierImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; +import org.codelutin.eugene.models.object.ObjectModelClassifier; +import org.codelutin.eugene.models.object.ObjectModelInterface; +import org.codelutin.eugene.models.object.ObjectModelOperation; /** * ObjectModelClassifierImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelElementImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelElementImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelElementImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,5 +1,5 @@ /* - * *##% Lutin Generator + * \*##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModelElement; +import org.codelutin.eugene.models.object.ObjectModelElement; /** * ObjectModelElementImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; +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; /** * Implementation class for the root node abstraction of object model trees. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplRef.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplRef.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplRef.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; /** * ObjectModelImplRef. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplSuperClassRef.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplSuperClassRef.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplSuperClassRef.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; /** * ObjectModelImplRef. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplTagValue.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplTagValue.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelImplTagValue.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; /** * ObjectModelImplTagValue.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelInterfaceImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelInterfaceImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelInterfaceImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; import java.util.Iterator; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; +import org.codelutin.eugene.models.object.ObjectModelClass; +import org.codelutin.eugene.models.object.ObjectModelClassifier; +import org.codelutin.eugene.models.object.ObjectModelInterface; /** * ObjectModelInterfaceImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelOperationImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelOperationImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/*##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.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.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; +import org.codelutin.eugene.models.object.ObjectModelOperation; +import org.codelutin.eugene.models.object.ObjectModelParameter; /** * ObjectModelOperationImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelParameterImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/object/xml/ObjectModelParameterImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.object.xml; +package org.codelutin.eugene.models.object.xml; -import org.codelutin.generator.models.object.ObjectModelParameter; +import org.codelutin.eugene.models.object.ObjectModelParameter; /** * ObjectModelParameterImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModel.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModel.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,11 +15,11 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; import java.util.List; -import org.codelutin.generator.models.Model; +import org.codelutin.eugene.models.Model; /** * StateModel Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelComplexState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelComplexState.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelComplexState.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelSimpleState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelSimpleState.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelSimpleState.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; /** * StateModelSimpleState Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelState.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelState.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelState.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; import java.util.List; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelStateChart.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelStateChart.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelStateChart.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; /** * StateModelStateChart Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelTransition.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelTransition.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/StateModelTransition.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; /** * StateModelTransition Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/DigesterStateModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/DigesterStateModelRuleSet.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/DigesterStateModelRuleSet.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelComplexeStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelComplexeStateImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelComplexeStateImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,17 +15,17 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.codelutin.generator.models.state.StateModelComplexState; -import org.codelutin.generator.models.state.StateModelSimpleState; -import org.codelutin.generator.models.state.StateModelState; -import org.codelutin.generator.models.state.StateModelTransition; +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; /** * StateModelComplexeStateImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.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.generator.models.state.StateModel; -import org.codelutin.generator.models.state.StateModelStateChart; +import org.codelutin.eugene.models.state.StateModel; +import org.codelutin.eugene.models.state.StateModelStateChart; /** * StateModelImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelSimpleStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelSimpleStateImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelSimpleStateImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; -import org.codelutin.generator.models.state.StateModelSimpleState; +import org.codelutin.eugene.models.state.StateModelSimpleState; /** * StateModelSimpleStateImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateChartImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateChartImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateChartImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; -import org.codelutin.generator.models.state.StateModelStateChart; +import org.codelutin.eugene.models.state.StateModelStateChart; /** * StateModelStateChartImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelStateImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; import java.util.ArrayList; import java.util.List; -import org.codelutin.generator.models.state.StateModelState; -import org.codelutin.generator.models.state.StateModelTransition; +import org.codelutin.eugene.models.state.StateModelState; +import org.codelutin.eugene.models.state.StateModelTransition; /** * StateModelStateImpl.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelTransitionImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelTransitionImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/state/xml/StateModelTransitionImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,10 +15,10 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state.xml; +package org.codelutin.eugene.models.state.xml; -import org.codelutin.generator.models.state.StateModelState; -import org.codelutin.generator.models.state.StateModelTransition; +import org.codelutin.eugene.models.state.StateModelState; +import org.codelutin.eugene.models.state.StateModelTransition; /** * StateModelTransitionImpl Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModel.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModel.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModel.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelArguments.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelArguments.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelArguments.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; import java.util.List; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelChild.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelChild.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelChild.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; /** * UIModelChild. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelConstraint.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelConstraint.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelConstraint.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; /** * UIModelConstraint. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelEvent.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelEvent.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelEvent.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; /** * UIModelEvent. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelObject.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelObject.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelObject.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2008 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -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.generator.models.ui; +package org.codelutin.eugene.models.ui; import java.util.Collection; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelProperty.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelProperty.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/UIModelProperty.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui; +package org.codelutin.eugene.models.ui; /** * UIModelProperty.java Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelArgumentsImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelArgumentsImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelArgumentsImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.codelutin.generator.models.ui.UIModelArguments; +import org.codelutin.eugene.models.ui.UIModelArguments; /** * UIModelArgumentsImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelChildImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelChildImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelChildImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,11 +17,11 @@ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; -import org.codelutin.generator.models.ui.UIModelChild; -import org.codelutin.generator.models.ui.UIModelObject; -import org.codelutin.generator.models.ui.UIModelConstraint; +import org.codelutin.eugene.models.ui.UIModelChild; +import org.codelutin.eugene.models.ui.UIModelConstraint; +import org.codelutin.eugene.models.ui.UIModelObject; /** * UIModelChildImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelConstraintImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelConstraintImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelConstraintImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,9 +17,9 @@ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; -import org.codelutin.generator.models.ui.UIModelConstraint; +import org.codelutin.eugene.models.ui.UIModelConstraint; /** * UIModelConstraintImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelEventImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelEventImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelEventImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,9 +17,9 @@ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; -import org.codelutin.generator.models.ui.UIModelEvent; +import org.codelutin.eugene.models.ui.UIModelEvent; /** * UIModelEventImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,14 +17,14 @@ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.UIModelObject; +import org.codelutin.eugene.models.ui.UIModel; +import org.codelutin.eugene.models.ui.UIModelObject; /** * UIModelImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelObjectImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelObjectImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelObjectImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,20 +15,20 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.UIModelArguments; -import org.codelutin.generator.models.ui.UIModelChild; -import org.codelutin.generator.models.ui.UIModelConstraint; -import org.codelutin.generator.models.ui.UIModelEvent; -import org.codelutin.generator.models.ui.UIModelObject; -import org.codelutin.generator.models.ui.UIModelProperty; +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; /** * UIModelObjectImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelPropertyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelPropertyImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/impl/UIModelPropertyImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,10 +17,10 @@ -package org.codelutin.generator.models.ui.impl; +package org.codelutin.eugene.models.ui.impl; -import org.codelutin.generator.models.ui.UIModelProperty; -import org.codelutin.generator.GeneratorException; +import org.codelutin.eugene.GeneratorException; +import org.codelutin.eugene.models.ui.UIModelProperty; /** * UIModelPropertyImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParser.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParser.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParser.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.javaxml; +package org.codelutin.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.generator.models.ui.UIModelEvent; -import org.codelutin.generator.models.ui.UIModelObject; -import org.codelutin.generator.models.ui.UIModelProperty; -import org.codelutin.generator.models.ui.impl.UIModelArgumentsImpl; -import org.codelutin.generator.models.ui.impl.UIModelChildImpl; -import org.codelutin.generator.models.ui.impl.UIModelConstraintImpl; -import org.codelutin.generator.models.ui.impl.UIModelEventImpl; -import org.codelutin.generator.models.ui.impl.UIModelImpl; -import org.codelutin.generator.models.ui.impl.UIModelObjectImpl; -import org.codelutin.generator.models.ui.impl.UIModelPropertyImpl; +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.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/DigesterUIModelRuleSet.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/DigesterUIModelRuleSet.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/DigesterUIModelRuleSet.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelArgumentsImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelArgumentsImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelArgumentsImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,13 +17,13 @@ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; import java.util.ArrayList; import java.util.List; -import org.codelutin.generator.models.ui.UIModelArguments; -import org.codelutin.generator.models.ui.UIModelObject; +import org.codelutin.eugene.models.ui.UIModelArguments; +import org.codelutin.eugene.models.ui.UIModelObject; /** * UIModelArgumentsImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelChildImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelChildImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelChildImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,11 +17,11 @@ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; -import org.codelutin.generator.models.ui.UIModelChild; -import org.codelutin.generator.models.ui.UIModelConstraint; -import org.codelutin.generator.models.ui.UIModelObject; +import org.codelutin.eugene.models.ui.UIModelChild; +import org.codelutin.eugene.models.ui.UIModelConstraint; +import org.codelutin.eugene.models.ui.UIModelObject; /** * UIModelChildImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelConstraintImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelConstraintImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelConstraintImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; -import org.codelutin.generator.models.ui.UIModelConstraint; +import org.codelutin.eugene.models.ui.UIModelConstraint; /** * UIModelConstraintImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelEventImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelEventImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelEventImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,9 +17,9 @@ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; -import org.codelutin.generator.models.ui.UIModelEvent; +import org.codelutin.eugene.models.ui.UIModelEvent; /** * UIModelEventImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,14 +15,14 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.UIModelObject; +import org.codelutin.eugene.models.ui.UIModel; +import org.codelutin.eugene.models.ui.UIModelObject; /** * UIModelImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelObjectImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelObjectImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelObjectImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,18 +15,18 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.UIModelChild; -import org.codelutin.generator.models.ui.UIModelConstraint; -import org.codelutin.generator.models.ui.UIModelEvent; -import org.codelutin.generator.models.ui.UIModelObject; -import org.codelutin.generator.models.ui.UIModelProperty; +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; /** * UIModelObjectImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelPropertyImpl.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelPropertyImpl.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/models/ui/xml/UIModelPropertyImpl.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -17,9 +17,9 @@ -package org.codelutin.generator.models.ui.xml; +package org.codelutin.eugene.models.ui.xml; -import org.codelutin.generator.models.ui.UIModelProperty; +import org.codelutin.eugene.models.ui.UIModelProperty; /** * UIModelPropertyImpl. Modified: eugene/trunk/src/main/java/org/codelutin/eugene/package-info.java =================================================================== --- eugene/trunk/src/main/java/org/codelutin/eugene/package-info.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/java/org/codelutin/eugene/package-info.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,5 +1,5 @@ /** * Lutin Generator. */ -package org.codelutin.generator; +package org.codelutin.eugene; Modified: eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/xsl/xmi1.2ToObjectModel.xsl 2009-03-06 16:58:59 UTC (rev 471) @@ -4,8 +4,8 @@ xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/lutingenerator/objectModel" - xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" + xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns:packageValidator="xalan://org.codelutin.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-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/xsl/xmi1.2ToStateModel.xsl 2009-03-06 16:58:59 UTC (rev 471) @@ -5,8 +5,8 @@ xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/lutingenerator/stateModel" - xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" + xmlns="http://www.codelutin.org/eugene/stateModel" + xmlns:packageValidator="xalan://org.codelutin.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-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/main/xsl/xmi2.1ToObjectModel.xsl 2009-03-06 16:58:59 UTC (rev 471) @@ -3,8 +3,8 @@ xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/lutingenerator/objectModel" - xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator" + xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns:packageValidator="xalan://org.codelutin.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" Modified: eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelDTDTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelDTDTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelDTDTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.eugene.models.state; import java.io.File; import java.io.FileInputStream; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/models/state/StateModelTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.state; +package org.codelutin.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.generator.StateModelGenerator; +import org.codelutin.eugene.StateModelGenerator; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParserTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/models/ui/javaxml/JavaXMLParserTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,15 +15,15 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.ui.javaxml; +package org.codelutin.eugene.models.ui.javaxml; import java.io.File; import java.util.ArrayList; -import org.codelutin.generator.models.ui.UIModel; -import org.codelutin.generator.models.ui.impl.UIModelChildImpl; -import org.codelutin.generator.models.ui.impl.UIModelEventImpl; -import org.codelutin.generator.models.ui.impl.UIModelObjectImpl; +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.codelutin.util.Resource; import org.junit.Assert; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/models/xml/ModelMergeTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/models/xml/ModelMergeTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/models/xml/ModelMergeTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -1,4 +1,4 @@ -/* *##% Lutin Generator +/* *##% Eugene * Copyright (C) 2004 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify @@ -15,15 +15,15 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.models.xml; +package org.codelutin.eugene.models.xml; import java.io.File; import java.net.URISyntaxException; import java.net.URL; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.eugene.ObjectModelGenerator; +import org.codelutin.eugene.models.object.ObjectModel; +import org.codelutin.eugene.models.object.ObjectModelClass; import org.codelutin.util.Resource; import org.junit.Test; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI12ToObjectModelTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.generator.xmi.objectmodel; +package org.codelutin.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.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.xmi.util.ResourceResolver; +import org.codelutin.eugene.ObjectModelGenerator; +import org.codelutin.eugene.models.object.ObjectModel; +import org.codelutin.eugene.xmi.util.ResourceResolver; import org.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/xmi/objectmodel/XMI21ToObjectModelTest.java 2009-03-06 16:58:59 UTC (rev 471) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.generator.xmi.objectmodel; +package org.codelutin.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.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; -import org.codelutin.generator.xmi.util.ResourceResolver; +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.codelutin.util.Resource; import org.junit.Assert; import org.junit.Before; Modified: eugene/trunk/src/test/java/org/codelutin/eugene/xmi/util/ResourceResolver.java =================================================================== --- eugene/trunk/src/test/java/org/codelutin/eugene/xmi/util/ResourceResolver.java 2009-03-06 15:43:50 UTC (rev 470) +++ eugene/trunk/src/test/java/org/codelutin/eugene/xmi/util/ResourceResolver.java 2009-03-06 16:58:59 UTC (rev 471) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.generator.xmi.util; +package org.codelutin.eugene.xmi.util; import java.net.URL; import java.net.URLClassLoader;

1 0

[Lutingenerator-commits] r470 - maven-eugene-plugin/trunk/src/main/java/org/codelutin
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 15:43:50 +0000 (Fri, 06 Mar 2009) New Revision: 470 Added: maven-eugene-plugin/trunk/src/main/java/org/codelutin/eugene/ Removed: maven-eugene-plugin/trunk/src/main/java/org/codelutin/generator/ Log: Package renaming Copied: maven-eugene-plugin/trunk/src/main/java/org/codelutin/eugene (from rev 469, maven-eugene-plugin/trunk/src/main/java/org/codelutin/generator)

1 0

[Lutingenerator-commits] r469 - eugene/trunk/src/test/java/org/codelutin
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 15:40:54 +0000 (Fri, 06 Mar 2009) New Revision: 469 Added: eugene/trunk/src/test/java/org/codelutin/eugene/ Removed: eugene/trunk/src/test/java/org/codelutin/generator/ Log: Package renaming Copied: eugene/trunk/src/test/java/org/codelutin/eugene (from rev 468, eugene/trunk/src/test/java/org/codelutin/generator)

1 0

[Lutingenerator-commits] r468 - eugene/trunk/src/main/java/org/codelutin
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 15:39:46 +0000 (Fri, 06 Mar 2009) New Revision: 468 Added: eugene/trunk/src/main/java/org/codelutin/eugene/ Removed: eugene/trunk/src/main/java/org/codelutin/generator/ Log: Package renaming Copied: eugene/trunk/src/main/java/org/codelutin/eugene (from rev 467, eugene/trunk/src/main/java/org/codelutin/generator)

1 0

[Lutingenerator-commits] r467 - /
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 15:17:10 +0000 (Fri, 06 Mar 2009) New Revision: 467 Added: maven-eugene-plugin/ Removed: maven-generator-plugin/ Log: Project renaming Copied: maven-eugene-plugin (from rev 466, maven-generator-plugin)

1 0

[Lutingenerator-commits] r466 - /
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 15:15:14 +0000 (Fri, 06 Mar 2009) New Revision: 466 Added: eugene/ Removed: lutingenerator/ Log: Project renaming Copied: eugene (from rev 465, lutingenerator)

1 0

[Lutingenerator-commits] r465 - lutingenerator/tags
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 14:19:46 +0000 (Fri, 06 Mar 2009) New Revision: 465 Added: lutingenerator/tags/before_renaming/ Log: Tagging before renaming Copied: lutingenerator/tags/before_renaming (from rev 464, lutingenerator/trunk)

1 0

[Lutingenerator-commits] r464 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: chatellier Date: 2009-03-06 13:22:06 +0000 (Fri, 06 Mar 2009) New Revision: 464 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: Load XSLT tranformer with JDK service loader. Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-06 10:51:39 UTC (rev 463) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-06 13:22:06 UTC (rev 464) @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.ServiceLoader; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.ZipEntry; @@ -456,8 +457,7 @@ // Transformation XSL try { - //AntClassLoader loader = getProject().createClassLoader(classpath); - //loader.setThreadContextLoader(); + String[] jars = classpath.list(); URL[] jarsURL = new URL[jars.length]; for (int i = 0; i < jars.length; i++) { @@ -470,13 +470,17 @@ urlLoader).newInstance(); // FIXME remove hard coded factory name - TransformerFactory tfabrique = TransformerFactory.newInstance( - "org.apache.xalan.processor.TransformerFactoryImpl", - urlLoader); + Iterator<TransformerFactory> itTransformerFactory = + ServiceLoader.load(TransformerFactory.class, urlLoader).iterator(); + if (!itTransformerFactory.hasNext()) { + throw new BuildException("No XLTS Transformer found"); + } + // take first impl found + TransformerFactory transformerFactory = itTransformerFactory.next(); URL uxsl = Resource.getURL(xsl); StreamSource stylesource = new StreamSource(uxsl.openStream()); - Transformer transformer = tfabrique.newTransformer(stylesource); + Transformer transformer = transformerFactory.newTransformer(stylesource); transformer.setParameter("fullPackagePath", properties .getProperty("fullPackagePath")); transformer.setParameter("extraPackages", properties

1 0

[Lutingenerator-commits] r463 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by nrannou＠users.labs.libre-entreprise.org March 6, 2009

March 6, 2009

Author: nrannou Date: 2009-03-06 10:51:39 +0000 (Fri, 06 Mar 2009) New Revision: 463 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: Chaine de conversion ZIP -> XMI -> ObjectModel -> Java Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-04 09:38:47 UTC (rev 462) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-06 10:51:39 UTC (rev 463) @@ -15,26 +15,42 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * .java - * - * - */ - package org.codelutin.generator; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.taskdefs.MatchingTask; - import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.Path; +import org.codelutin.util.Resource; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + /** * Ant generator Task. * @@ -42,21 +58,24 @@ * * <pre> * <taskdef name="generator" classname="org.codelutin.generator.GeneratorTask" - * classpath="lib/lutingenerator-0.64.jar" /> + * classpath="${compile.classpath}:${targetbuild}:${resources}" /> * - * <generator - * template="org.codelutin.generator.generators.persistence.TopiaModelToDTOGenerator.java,org.codelutin.generator.generators.persistence.TopiaModelToTJDOGenerator.java" - * destdir="target/gen/java" srcdir="target/gen/model" /> + * <target name="generate" depends="pre-compile" description="generate"> + * <generator srcdir="${modelDir}" destdir="${targetgen}" + * resolver="ResourceResolver" + * templates="ClassInfoGenerator,JavaBeanGenerator" + * properties="defaultPackage=org.codelutin,fullPackagePath=org.codelutin,extraPackages=org.codelutin" + * classpath="${compile.classpath}:${targetbuild}:${resources}" /> + * </target> * </pre> * * Created: 14 janv. 2004 - * - * @author Benjamin Poussin <poussin(a)codelutin.com> - * Copyright Code Lutin + * + * @author Benjamin Poussin <poussin(a)codelutin.com> Copyright Code Lutin * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * + * Mise a jour: $Date$ + * par : $Author$ */ public class GeneratorTask extends MatchingTask { // GeneratorTask @@ -75,20 +94,28 @@ /** Destination directory. */ protected File destDir = null; + /** URI Resolver. */ + protected String resolver = null; + /** Additional generator properties. */ protected Properties properties = new Properties(); /** Overwrite already existing generated files. */ protected boolean overwrite = true; - /** customized classloader. */ - protected ClassLoader loader; + /** + * Ant classpath to use. + */ + private Path classpath = null; /** Enconding. Default to UTF-8. */ protected String encoding = "UTF-8"; - + + /** log. */ + private static final Log log = LogFactory.getLog(GeneratorTask.class); + public GeneratorTask() { - + } protected void doExecute(File srcFile, File destDir, Generator[] generators) @@ -99,13 +126,20 @@ protected void doExecute(File[] srcFiles, File destDir, Generator[] generators) throws BuildException { + + srcFiles = doConvertFiles(srcFiles, destDir); + for (Generator generator : generators) { if (generator != null) { log("Applying " + generator.getClass().getName() + " into " + destDir); generator.setProperties(properties); generator.setOverwrite(overwrite); - generator.generate(srcFiles, destDir); + for (int i = 0; i < srcFiles.length; i++) { + if (srcFiles[i].getName().endsWith(".objectmodel")) { + generator.generate(srcFiles[i], destDir); + } + } } } } @@ -127,8 +161,32 @@ } /** + * Set the optional classpath to the XSL processor + * + * @param classpath + * the classpath to use when loading the XSL processor + */ + public void setClasspath(Path classpath) { + createClasspath().append(classpath); + } + + /** + * Set the optional classpath to the XSL processor + * + * @return a path instance to be configured by the Ant core. + */ + public Path createClasspath() { + if (classpath == null) { + classpath = new Path(getProject()); + } + return classpath.createPath(); + } + + /** * Permet d'ajouter des properties. exemple: toto=1,package=org.codelutin - * @param properties properties + * + * @param properties + * properties */ public void setProperties(String properties) { String[] props = properties.split(","); @@ -152,8 +210,8 @@ this.srcFile = srcFile; } - public void setLoader(ClassLoader loader) { - this.loader = loader; + public void setResolver(String resolver) { + this.resolver = resolver; } @Override @@ -166,7 +224,8 @@ List<String> templateGenerators = Arrays.asList(templates.split(",")); for (Iterator<String> it = templateGenerators.iterator(); it.hasNext();) { String templateGenerator = it.next(); - if (excludeTemplates != null && excludeTemplates.contains(templateGenerator)) { + if (excludeTemplates != null + && excludeTemplates.contains(templateGenerator)) { it.remove(); } } @@ -176,7 +235,8 @@ try { generators[i] = newGeneratorInstance(templateName); - //generators[i] = (Generator) Class.forName(templateName).newInstance(); + // generators[i] = (Generator) + // Class.forName(templateName).newInstance(); generators[i].setExcludeTemplates(excludeTemplates); generators[i].setEncoding(encoding); @@ -237,16 +297,208 @@ } } + private File[] doConvertFiles(File[] srcFiles, File destDir) { + List<File> result = new ArrayList<File>(); + for (File file : srcFiles) { + if (file.getName().endsWith(".objectmodel")) { + result.add(file); + } else { + + File xmiFile = null; + String xmiVersion = null; + String destFileName = file.getName().substring(0, + file.getName().lastIndexOf('.')); + File destUnZipDir = new File("tmp-" + destFileName); + + // unzip files + if (file.getName().endsWith(".zargo") + || file.getName().endsWith(".zuml")) { + + // destination folder + destUnZipDir.mkdir(); + + unzip(file, destUnZipDir); + + xmiFile = new File(destUnZipDir.getAbsolutePath() + + File.separator + destFileName + ".xmi"); + } else if (file.getName().endsWith(".uml") + || file.getName().endsWith(".xmi")) { + xmiFile = file; + } + + System.out.println(xmiFile); + + // XMI to ObjectModel + xmiVersion = getXmiVersion(xmiFile); + String omFileName = srcDir + File.separator + destFileName + + ".objectmodel"; + if (xmiVersion.equals("1.2")) { + XMLtransform(xmiFile.getAbsolutePath(), omFileName, + "xmi1.2ToObjectModel.xsl"); + } else if (xmiVersion.equals("2.1")) { + XMLtransform(xmiFile.getAbsolutePath(), omFileName, + "xmi2.1ToObjectModel.xsl"); + } + + result.add(new File(omFileName)); + + // delete unzipped files + if (file.getName().endsWith(".zargo") + || file.getName().endsWith(".zuml")) { + + delete(destUnZipDir); + } + + } + } + return result.toArray(new File[result.size()]); + } + + private void unzip(File zipFile, File destFile) { + try { + + // uncompress zip archive + ZipInputStream zipin = new ZipInputStream(new FileInputStream( + zipFile)); + ZipEntry zipe = null; + while ((zipe = zipin.getNextEntry()) != null) { + FileOutputStream fileout = new FileOutputStream(destFile + .getAbsolutePath() + + File.separator + zipe.getName()); + + // write current file + byte[] buf = new byte[1024]; + int rsize; + while ((rsize = zipin.read(buf)) > -1) + fileout.write(buf, 0, rsize); + + zipin.closeEntry(); + fileout.close(); + } + zipin.close(); + } catch (Exception e) { + System.out.println("Unzip error"); + e.printStackTrace(); + } + } + + private void delete(File dir) { + if (dir.exists()) { + File[] files = dir.listFiles(); + for (int i = 0; i < files.length; i++) { + if (files[i].isDirectory()) { + delete(files[i]); + } else { + files[i].delete(); + } + } + } + dir.delete(); + } + + private String getXmiVersion(File XMIFile) { + String version = null; + try { + SAXParserFactory fabrique = SAXParserFactory.newInstance(); + SAXParser parser = fabrique.newSAXParser(); + + DefaultHandler handler = new XmiVersionHandler(); + parser.parse(XMIFile, handler); + + } catch (Exception e) { + version = e.getMessage(); + } + return version; + } + + private class XmiVersionHandler extends DefaultHandler { + public String version = null; + + public XmiVersionHandler() { + super(); + } + + public void startElement(String uri, String localName, String qName, + Attributes attributes) throws SAXException { + + if (qName.equals("XMI")) { + version = attributes.getValue("xmi.version"); + } + if (version == null) { + version = attributes.getValue("xmi:version"); + } + + if (log.isInfoEnabled()) { + log.info("XMI version found : " + version); + } + throw new SAXException(version); + } + + public void startDocument() throws SAXException { + if (log.isInfoEnabled()) { + log.info("Parsing XMI version..."); + } + } + + public void endDocument() throws SAXException { + if (log.isInfoEnabled()) { + log.info("XMI version not found"); + } + } + } + + private void XMLtransform(String xmlFrom, String xmlTo, String xsl) { + + if (log.isDebugEnabled()) { + log.debug("XMLtransform : java.class.path = " + + System.getProperty("java.class.path")); + } + + // Transformation XSL + try { + //AntClassLoader loader = getProject().createClassLoader(classpath); + //loader.setThreadContextLoader(); + String[] jars = classpath.list(); + URL[] jarsURL = new URL[jars.length]; + for (int i = 0; i < jars.length; i++) { + jarsURL[i] = new File(jars[i]).toURI().toURL(); + } + + URLClassLoader urlLoader = new URLClassLoader(jarsURL); + + URIResolver tresolver = (URIResolver) Class.forName(resolver, true, + urlLoader).newInstance(); + + // FIXME remove hard coded factory name + TransformerFactory tfabrique = TransformerFactory.newInstance( + "org.apache.xalan.processor.TransformerFactoryImpl", + urlLoader); + + URL uxsl = Resource.getURL(xsl); + StreamSource stylesource = new StreamSource(uxsl.openStream()); + Transformer transformer = tfabrique.newTransformer(stylesource); + transformer.setParameter("fullPackagePath", properties + .getProperty("fullPackagePath")); + transformer.setParameter("extraPackages", properties + .getProperty("extraPackages")); + transformer.setURIResolver(tresolver); + if (log.isInfoEnabled()) { + log.info("FROM: " + xmlFrom); + log.info("TO: " + xmlTo); + } + transformer.transform(new StreamSource(xmlFrom), new StreamResult( + xmlTo)); + } catch (Exception e) { + System.out.println("Transformation error"); + e.printStackTrace(); + } + } + protected Generator newGeneratorInstance(String fqn) throws ClassNotFoundException, IllegalAccessException, InstantiationException { - Generator newInstance = null; - if (loader == null) { - newInstance = (Generator) Class.forName(fqn).newInstance(); - } else { - newInstance = (Generator) Class.forName(fqn, true, loader) - .newInstance(); - } + Generator newInstance = (Generator) Class.forName(fqn).newInstance(); + return newInstance; } } // GeneratorTask

1 0

[Lutingenerator-commits] r462 - lutingenerator/trunk/src/main/java/org/codelutin/generator
by chatellier＠users.labs.libre-entreprise.org March 4, 2009

March 4, 2009

Author: chatellier Date: 2009-03-04 09:38:47 +0000 (Wed, 04 Mar 2009) New Revision: 462 Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java Log: Fix NullPointerException Modified: lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java =================================================================== --- lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-02-27 17:55:57 UTC (rev 461) +++ lutingenerator/trunk/src/main/java/org/codelutin/generator/GeneratorTask.java 2009-03-04 09:38:47 UTC (rev 462) @@ -40,12 +40,14 @@ * * Exemple d'utilisation dans ant : * + * <pre> * <taskdef name="generator" classname="org.codelutin.generator.GeneratorTask" - * classpath="${lib}/lutingenerator-0.64.jar" /> + * classpath="lib/lutingenerator-0.64.jar" /> * * <generator * template="org.codelutin.generator.generators.persistence.TopiaModelToDTOGenerator.java,org.codelutin.generator.generators.persistence.TopiaModelToTJDOGenerator.java" - * destdir="target/gen/java" srcdir="target/gen/model" includes="*.xmi"/> + * destdir="target/gen/java" srcdir="target/gen/model" /> + * </pre> * * Created: 14 janv. 2004 * @@ -58,7 +60,35 @@ */ public class GeneratorTask extends MatchingTask { // GeneratorTask + /** Template used in generation (comma separated). */ + protected String templates = null; + + /** Template to exclude in templates list. */ + protected List<String> excludeTemplates; + + /** Model directory. */ + protected File srcDir = null; + + /** Single model file. */ + protected File srcFile = null; + + /** Destination directory. */ + protected File destDir = null; + + /** Additional generator properties. */ + protected Properties properties = new Properties(); + + /** Overwrite already existing generated files. */ + protected boolean overwrite = true; + + /** customized classloader. */ + protected ClassLoader loader; + + /** Enconding. Default to UTF-8. */ + protected String encoding = "UTF-8"; + public GeneratorTask() { + } protected void doExecute(File srcFile, File destDir, Generator[] generators) @@ -80,25 +110,6 @@ } } - protected String templates = null; - - protected List<String> excludeTemplates; - - protected File srcDir = null; - - protected File srcFile = null; - - protected File destDir = null; - - protected Properties properties = new Properties(); - - protected boolean overwrite = true; - - // to enable a customized classloader - protected ClassLoader loader; - - protected String encoding; - public void setOverwrite(boolean v) { overwrite = v; } @@ -155,7 +166,7 @@ List<String> templateGenerators = Arrays.asList(templates.split(",")); for (Iterator<String> it = templateGenerators.iterator(); it.hasNext();) { String templateGenerator = it.next(); - if (excludeTemplates.contains(templateGenerator)) { + if (excludeTemplates != null && excludeTemplates.contains(templateGenerator)) { it.remove(); } }

1 0