Author: chatellier Date: 2009-02-17 11:42:34 +0000 (Tue, 17 Feb 2009) New Revision: 1818 Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.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/MetierSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.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/PopulationSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 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/StrategyMonthInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml Log: Update mapping generated by new refactored generators Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -16,7 +16,7 @@ <property name="repairAndMaintenanceGearCost" type="double" access="field" column="repairAndMaintenanceGearCost" node="repairAndMaintenanceGearCost"/> <property name="otherRunningCost" type="double" access="field" column="otherRunningCost" node="otherRunningCost"/> <property name="landingCosts" type="double" access="field" column="landingCosts" node="landingCosts"/> - <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false"/> - <many-to-one name="possibleMetiers" class="fr.ifremer.isisfish.entities.MetierImpl" column="possibleMetiers" node="possibleMetiers/@topiaId" embed-xml="false"/> + <many-to-one name="setOfVessels" class="fr.ifremer.isisfish.entities.SetOfVesselsImpl" column="setOfVessels" node="setOfVessels/@topiaId" embed-xml="false" /> + <many-to-one name="possibleMetiers" class="fr.ifremer.isisfish.entities.MetierImpl" column="possibleMetiers" node="possibleMetiers/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -12,7 +12,7 @@ <property name="cost" type="double" access="field" column="cost" node="cost"/> <property name="possibleValue" type="fr.ifremer.isisfish.types.hibernate.RangeOfValuesType" access="field" column="possibleValue" node="possibleValue"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="populationSelectivity" lazy="true" cascade="all,delete-orphan" node="populationSelectivity" embed-xml="true"> + <bag name="populationSelectivity" lazy="true" cascade="all,delete-orphan" node="populationSelectivity" embed-xml="false"> <key column="gear"/> <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> </bag> 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-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -9,12 +9,12 @@ <property name="gearParameterValue" type="text" access="field" column="gearParameterValue" node="gearParameterValue"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> <property name="capturableSpeciesComment" type="text" access="field" column="capturableSpeciesComment" node="capturableSpeciesComment"/> - <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> - <bag name="setOfVesselsEffortDescription" inverse="true" lazy="true" cascade="all,delete-orphan" node="setOfVesselsEffortDescription" embed-xml="true"> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false" /> + <bag name="setOfVesselsEffortDescription" inverse="true" lazy="true" cascade="all,delete-orphan" node="setOfVesselsEffortDescription" embed-xml="false"> <key column="possibleMetiers"/> <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="metierSeasonInfo" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfo" embed-xml="true"> + <bag name="metierSeasonInfo" inverse="true" 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/MetierSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -5,12 +5,12 @@ <!--key column="topiaId"/--> <property name="seasonZoneComment" type="text" access="field" column="seasonZoneComment" node="seasonZoneComment"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="speciesTargetSpecies" lazy="true" cascade="all,delete-orphan" node="speciesTargetSpecies" embed-xml="true"> + <bag name="speciesTargetSpecies" lazy="true" cascade="all,delete-orphan" node="speciesTargetSpecies" embed-xml="false"> <key column="metierSeasonInfo"/> <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> </bag> - <many-to-one name="metier" class="fr.ifremer.isisfish.entities.MetierImpl" column="metier" node="metier/@topiaId" embed-xml="false"/> - <bag name="zone" table="metierseasoninfo_zone" lazy="true" node="zone" embed-xml="true"> + <many-to-one name="metier" class="fr.ifremer.isisfish.entities.MetierImpl" column="metier" node="metier/@topiaId" embed-xml="false" /> + <bag name="zone" table="metierseasoninfo_zone" lazy="true" node="zone" embed-xml="true"> <key column="metierSeasonInfo"/> <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="zone" node="topiaId"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -11,6 +11,6 @@ <property name="minLength" type="double" access="field" column="minLength" node="minLength"/> <property name="maxLength" type="double" access="field" column="maxLength" node="maxLength"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> 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-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -8,14 +8,14 @@ <property name="name" type="text" access="field" column="name" node="name"/> <property name="geographicId" type="text" access="field" column="geographicId" node="geographicId"/> <property name="plusGroup" type="boolean" access="field" column="plusGroup" node="plusGroup"/> - <many-to-one name="growth" class="fr.ifremer.isisfish.entities.EquationImpl" column="growth" cascade="delete" node="growth/@topiaId" embed-xml="false"/> - <many-to-one name="growthReverse" class="fr.ifremer.isisfish.entities.EquationImpl" column="growthReverse" cascade="delete" node="growthReverse/@topiaId" embed-xml="false"/> + <many-to-one name="growth" class="fr.ifremer.isisfish.entities.EquationImpl" column="growth" cascade="delete" node="growth/@topiaId" embed-xml="false" /> + <many-to-one name="growthReverse" class="fr.ifremer.isisfish.entities.EquationImpl" column="growthReverse" cascade="delete" node="growthReverse/@topiaId" embed-xml="false" /> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="meanWeight" class="fr.ifremer.isisfish.entities.EquationImpl" column="meanWeight" cascade="delete" node="meanWeight/@topiaId" embed-xml="false"/> - <many-to-one name="price" class="fr.ifremer.isisfish.entities.EquationImpl" column="price" cascade="delete" node="price/@topiaId" embed-xml="false"/> - <many-to-one name="naturalDeathRate" class="fr.ifremer.isisfish.entities.EquationImpl" column="naturalDeathRate" cascade="delete" node="naturalDeathRate/@topiaId" embed-xml="false"/> + <many-to-one name="meanWeight" class="fr.ifremer.isisfish.entities.EquationImpl" column="meanWeight" cascade="delete" node="meanWeight/@topiaId" embed-xml="false" /> + <many-to-one name="price" class="fr.ifremer.isisfish.entities.EquationImpl" column="price" cascade="delete" node="price/@topiaId" embed-xml="false" /> + <many-to-one name="naturalDeathRate" class="fr.ifremer.isisfish.entities.EquationImpl" column="naturalDeathRate" cascade="delete" node="naturalDeathRate/@topiaId" embed-xml="false" /> <property name="caractBioComment" type="text" access="field" column="caractBioComment" node="caractBioComment"/> - <many-to-one name="reproductionEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="reproductionEquation" cascade="delete" node="reproductionEquation/@topiaId" embed-xml="false"/> + <many-to-one name="reproductionEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="reproductionEquation" cascade="delete" node="reproductionEquation/@topiaId" embed-xml="false" /> <property name="monthGapBetweenReproRecrutement" type="int" access="field" column="monthGapBetweenReproRecrutement" node="monthGapBetweenReproRecrutement"/> <property name="recruitmentDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > <column name="recruitmentDistribution_name"/> @@ -43,31 +43,31 @@ <column name="capturability_semantics"/> <column name="capturability_data"/> </property> - <bag name="gearSelectivity" inverse="true" lazy="true" cascade="all,delete-orphan" node="gearSelectivity" embed-xml="true"> + <bag name="gearSelectivity" inverse="true" lazy="true" cascade="all,delete-orphan" node="gearSelectivity" embed-xml="false"> <key column="population"/> <one-to-many class="fr.ifremer.isisfish.entities.SelectivityImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="populationGroup" order-by="id" lazy="true" cascade="all,delete-orphan" node="populationGroup" embed-xml="true"> + <bag name="populationGroup" 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" order-by="firstMonth, lastMonth" inverse="true" lazy="true" cascade="all,delete-orphan" node="populationSeasonInfo" embed-xml="true"> + <bag name="populationSeasonInfo" inverse="true" 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> - <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> - <bag name="reproductionZone" table="population_reproductionzone" lazy="true" node="reproductionZone" embed-xml="true"> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false" /> + <bag name="reproductionZone" table="population_reproductionzone" lazy="true" node="reproductionZone" embed-xml="true"> <key column="population"/> <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="reproductionZone" node="topiaId"/> </bag> - <bag name="populationZone" table="population_populationzone" lazy="true" node="populationZone" embed-xml="true"> + <bag name="populationZone" table="population_populationzone" lazy="true" node="populationZone" embed-xml="true"> <key column="population"/> <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="populationZone" node="topiaId"/> </bag> - <bag name="recruitmentZone" table="population_recruitmentzone" lazy="true" node="recruitmentZone" embed-xml="true"> + <bag name="recruitmentZone" table="population_recruitmentzone" lazy="true" node="recruitmentZone" embed-xml="true"> <key column="population"/> <many-to-many class="fr.ifremer.isisfish.entities.ZoneImpl" column="recruitmentZone" node="topiaId"/> </bag> - <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" unique="true" node="maturityGroup/@topiaId" embed-xml="false"/> + <many-to-one name="maturityGroup" class="fr.ifremer.isisfish.entities.PopulationGroupImpl" column="maturityGroup" unique="true" node="maturityGroup/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -42,9 +42,9 @@ <column name="immigrationMatrix_semantics"/> <column name="immigrationMatrix_data"/> </property> - <many-to-one name="migrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="migrationEquation" cascade="delete" node="migrationEquation/@topiaId" embed-xml="false"/> - <many-to-one name="emigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="emigrationEquation" cascade="delete" node="emigrationEquation/@topiaId" embed-xml="false"/> - <many-to-one name="immigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="immigrationEquation" cascade="delete" node="immigrationEquation/@topiaId" embed-xml="false"/> - <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + <many-to-one name="migrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="migrationEquation" cascade="delete" node="migrationEquation/@topiaId" embed-xml="false" /> + <many-to-one name="emigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="emigrationEquation" cascade="delete" node="emigrationEquation/@topiaId" embed-xml="false" /> + <many-to-one name="immigrationEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="immigrationEquation" cascade="delete" node="immigrationEquation/@topiaId" embed-xml="false" /> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false" /> </union-subclass> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -7,6 +7,6 @@ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false"/> + <many-to-one name="cell" class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="cell/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -5,8 +5,8 @@ <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false"/> - <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false"/> - <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false"/> + <many-to-one name="equation" class="fr.ifremer.isisfish.entities.EquationImpl" column="equation" cascade="delete" node="equation/@topiaId" embed-xml="false" /> + <many-to-one name="gear" class="fr.ifremer.isisfish.entities.GearImpl" column="gear" node="gear/@topiaId" embed-xml="false" /> + <many-to-one name="population" class="fr.ifremer.isisfish.entities.PopulationImpl" column="population" node="population/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -12,12 +12,12 @@ <property name="capitalDeprecation" type="double" access="field" column="capitalDeprecation" node="capitalDeprecation"/> <property name="interestCost" type="double" access="field" column="interestCost" node="interestCost"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="technicalEfficiencyEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="technicalEfficiencyEquation" cascade="delete" node="technicalEfficiencyEquation/@topiaId" embed-xml="false"/> - <many-to-one name="port" class="fr.ifremer.isisfish.entities.PortImpl" column="port" node="port/@topiaId" embed-xml="false"/> - <bag name="possibleMetiers" lazy="true" cascade="all,delete-orphan" node="possibleMetiers" embed-xml="true"> + <many-to-one name="technicalEfficiencyEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="technicalEfficiencyEquation" cascade="delete" node="technicalEfficiencyEquation/@topiaId" embed-xml="false" /> + <many-to-one name="port" class="fr.ifremer.isisfish.entities.PortImpl" column="port" node="port/@topiaId" embed-xml="false" /> + <bag name="possibleMetiers" lazy="true" cascade="all,delete-orphan" node="possibleMetiers" embed-xml="false"> <key column="setOfVessels"/> <one-to-many class="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="topiaId" embed-xml="false"/> </bag> - <many-to-one name="vesselType" class="fr.ifremer.isisfish.entities.VesselTypeImpl" column="vesselType" node="vesselType/@topiaId" embed-xml="false"/> + <many-to-one name="vesselType" class="fr.ifremer.isisfish.entities.VesselTypeImpl" column="vesselType" node="vesselType/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -11,11 +11,11 @@ <property name="codeCEE" type="int" access="field" column="codeCEE" node="codeCEE"/> <property name="ageGroupType" type="boolean" access="field" column="ageGroupType" node="ageGroupType"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="metierSeasonInfoTargetSpecies" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfoTargetSpecies" embed-xml="true"> + <bag name="metierSeasonInfoTargetSpecies" inverse="true" lazy="true" cascade="all,delete-orphan" node="metierSeasonInfoTargetSpecies" embed-xml="false"> <key column="species"/> <one-to-many class="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="topiaId" embed-xml="false"/> </bag> - <bag name="population" inverse="true" lazy="true" cascade="all,delete-orphan" node="population" embed-xml="true"> + <bag name="population" inverse="true" lazy="true" cascade="all,delete-orphan" node="population" embed-xml="false"> <key column="species"/> <one-to-many class="fr.ifremer.isisfish.entities.PopulationImpl" 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-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -9,9 +9,9 @@ <property name="proportionSetOfVessels" type="double" access="field" column="proportionSetOfVessels" node="proportionSetOfVessels"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> <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" order-by="month" inverse="true" lazy="true" cascade="all,delete-orphan" node="strategyMonthInfo" embed-xml="true"> + <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"> <key column="strategy"/> <one-to-many class="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="topiaId" embed-xml="false"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -15,7 +15,7 @@ <column name="proportionMetier_semantics"/> <column name="proportionMetier_data"/> </property> - <many-to-one name="tripType" class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="tripType/@topiaId" embed-xml="false"/> - <many-to-one name="strategy" class="fr.ifremer.isisfish.entities.StrategyImpl" column="strategy" node="strategy/@topiaId" embed-xml="false"/> + <many-to-one name="tripType" class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="tripType/@topiaId" embed-xml="false" /> + <many-to-one name="strategy" class="fr.ifremer.isisfish.entities.StrategyImpl" column="strategy" node="strategy/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -5,9 +5,9 @@ <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false"/> + <many-to-one name="targetFactorEquation" class="fr.ifremer.isisfish.entities.EquationImpl" column="targetFactorEquation" cascade="delete" node="targetFactorEquation/@topiaId" embed-xml="false" /> <property name="primaryCatch" type="boolean" access="field" column="primaryCatch" node="primaryCatch"/> - <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false"/> - <many-to-one name="metierSeasonInfo" class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" column="metierSeasonInfo" node="metierSeasonInfo/@topiaId" embed-xml="false"/> + <many-to-one name="species" class="fr.ifremer.isisfish.entities.SpeciesImpl" column="species" node="species/@topiaId" embed-xml="false" /> + <many-to-one name="metierSeasonInfo" class="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" column="metierSeasonInfo" node="metierSeasonInfo/@topiaId" embed-xml="false" /> </class> </hibernate-mapping> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -13,7 +13,7 @@ <property name="minCrewSize" type="int" access="field" column="minCrewSize" node="minCrewSize"/> <property name="unitFuelCostOfTravel" type="double" access="field" column="unitFuelCostOfTravel" node="unitFuelCostOfTravel"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="tripType" table="triptype_vesseltype" lazy="true" node="tripType" embed-xml="true"> + <bag name="tripType" table="triptype_vesseltype" lazy="true" node="tripType" embed-xml="true"> <key column="vesselType"/> <many-to-many class="fr.ifremer.isisfish.entities.TripTypeImpl" column="tripType" node="topiaId"/> </bag> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2009-02-16 11:59:33 UTC (rev 1817) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2009-02-17 11:42:34 UTC (rev 1818) @@ -7,7 +7,7 @@ <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> <property name="name" type="text" access="field" column="name" node="name"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true"> + <bag name="cell" table="cell_zone" lazy="true" node="cell" embed-xml="true"> <key column="zone"/> <many-to-many class="fr.ifremer.isisfish.entities.CellImpl" column="cell" node="topiaId"/> </bag>