Author: chatellier Date: 2009-03-17 14:39:41 +0000 (Tue, 17 Mar 2009) New Revision: 1983 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml Log: Correct regression du to topia "order-by" change Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/pom.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -346,7 +346,7 @@ <!-- Custom version --> <jaxx.version>1.3-SNAPSHOT</jaxx.version> - <topia.version>2.1.3</topia.version> + <topia.version>2.1.4-SNAPSHOT</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3</lutinutil.version> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -14,7 +14,7 @@ <key column="possibleMetiers"/> <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="metierSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> + <bag name="metierSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="false"> <key column="metier"/> <one-to-many class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -47,11 +47,11 @@ <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationGroup" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> + <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationSeasonInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> + <bag name="populationSeasonInfo" inverse="true" order-by="firstMonth, lastMonth" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-03-17 14:14:48 UTC (rev 1982) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-03-17 14:39:41 UTC (rev 1983) @@ -11,7 +11,7 @@ <property name="inactivityEquationUsed" type="boolean" access="field" column="inactivityEquationUsed" node="inactivityEquationUsed"/> <many-to-one name="inactivityEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="inactivityEquation" cascade="delete" node="inactivityEquation/@topiaId" embed-xml="false" /> <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false" /> - <bag name="strategyMonthInfo" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> + <bag name="strategyMonthInfo" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="false"> <key column="strategy"/> <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> </bag>