Author: fdesbois Date: 2009-11-06 11:30:27 +0100 (Fri, 06 Nov 2009) New Revision: 700 Modified: branches/eugene-2.0/eugene-test/src/main/models/dtotest.objectmodel branches/eugene-2.0/eugene-test/src/main/models/dtotest2.objectmodel Log: Change test models to avoid errors in generated files + add or clean logs Modified: branches/eugene-2.0/eugene-test/src/main/models/dtotest.objectmodel =================================================================== --- branches/eugene-2.0/eugene-test/src/main/models/dtotest.objectmodel 2009-11-05 19:04:51 UTC (rev 699) +++ branches/eugene-2.0/eugene-test/src/main/models/dtotest.objectmodel 2009-11-06 10:30:27 UTC (rev 700) @@ -69,12 +69,11 @@ <class name="Voiture" abstract="true" package="org.nuiton.eugene.test.beangen"> <stereotype name="bean"/> <tagValue name="documentation" value="Doc for BeanA"/> - <interface name="org.nuiton.eugene.test.beangen.Vehicule"/> <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> <tagValue name="documentation" value="attrA of BeanA"/> </attribute> <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test.Personne" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> </class> @@ -84,7 +83,7 @@ <returnParameter type="void"/> </operation> <operation name="getModel" visibility="public"> - <returnParameter type="org.nuiton.eugene.test.Product"/> + <returnParameter type="int"/> <parameter name="id" type="java.lang.String"/> </operation> <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> Modified: branches/eugene-2.0/eugene-test/src/main/models/dtotest2.objectmodel =================================================================== --- branches/eugene-2.0/eugene-test/src/main/models/dtotest2.objectmodel 2009-11-05 19:04:51 UTC (rev 699) +++ branches/eugene-2.0/eugene-test/src/main/models/dtotest2.objectmodel 2009-11-06 10:30:27 UTC (rev 700) @@ -69,12 +69,11 @@ <class name="Voiture" abstract="true" package="org.nuiton.eugene.test2.beangen"> <stereotype name="bean"/> <tagValue name="documentation" value="Doc for BeanA"/> - <interface name="org.nuiton.eugene.test2.beangen.Vehicule"/> <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> <tagValue name="documentation" value="attrA of BeanA"/> </attribute> <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test2.Personne" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test2.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> </class> @@ -84,7 +83,7 @@ <returnParameter type="void"/> </operation> <operation name="getModel" visibility="public"> - <returnParameter type="org.nuiton.eugene.test2.Product"/> + <returnParameter type="int"/> <parameter name="id" type="java.lang.String"/> </operation> <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/>