Author: bleny Date: 2014-02-28 17:50:03 +0100 (Fri, 28 Feb 2014) New Revision: 1704 Url: http://codelutin.com/projects/wao/repository/revisions/1704 Log: rename model and tagValues to prevent classpath conflict Added: trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-persistence/src/main/xmi/wao-model.zargo Removed: trunk/wao-persistence/src/main/xmi/wao.properties trunk/wao-persistence/src/main/xmi/wao.zargo Copied: trunk/wao-persistence/src/main/xmi/wao-model.properties (from rev 1679, trunk/wao-persistence/src/main/xmi/wao.properties) =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties (rev 0) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-02-28 16:50:03 UTC (rev 1704) @@ -0,0 +1,73 @@ +### +# #%L +# Wao :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +model.tagValue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ +model.tagValue.java.lang.String=text +model.tagValue.exceptionClass=fr.ifremer.wao.WaoException +model.tagValue.notGenerateToString=true +model.tagValue.constantPrefix=PROPERTY_ +model.tagValue.useEnumerationName=true +model.tagValue.indexForeignKeys=true + +# model.tagValue.doNotGenerateBooleanGetMethods=true + +#model.tagValue.useLegacyDAO=true + +fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false + +fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate +fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode +fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false +fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false +#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive +#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false +fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc + +fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false + +fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code + +#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false +fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive + +fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false + +fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false +fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false + +fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false + +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false +fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false +fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level + +fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false +fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true + +fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true Copied: trunk/wao-persistence/src/main/xmi/wao-model.zargo (from rev 1689, trunk/wao-persistence/src/main/xmi/wao.zargo) =================================================================== (Binary files differ) Deleted: trunk/wao-persistence/src/main/xmi/wao.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao.properties 2014-02-28 16:10:56 UTC (rev 1703) +++ trunk/wao-persistence/src/main/xmi/wao.properties 2014-02-28 16:50:03 UTC (rev 1704) @@ -1,73 +0,0 @@ -### -# #%L -# Wao :: Business -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -model.tagValue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ -model.tagValue.java.lang.String=text -model.tagValue.exceptionClass=fr.ifremer.wao.WaoException -model.tagValue.notGenerateToString=true -model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.useEnumerationName=true -model.tagValue.indexForeignKeys=true - -# model.tagValue.doNotGenerateBooleanGetMethods=true - -#model.tagValue.useLegacyDAO=true - -fr.ifremer.wao.entity.WaoUser.attribute.userProfile.tagValue.lazy=false - -fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.fishingZone.tagValue.orderBy=facadeName,sectorName,districtCode -fr.ifremer.wao.entity.SampleRow.attribute.company.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.profession.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.dCF5Code.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.fishingGearDCF.tagValue.lazy=false -fr.ifremer.wao.entity.DCF5Code.attribute.targetSpeciesDCF.tagValue.lazy=false -#fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.elligibleBoat.tagValue.orderBy=companyActive -#fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.lazy=false -fr.ifremer.wao.entity.SampleRow.attribute.sampleRowLog.tagValue.orderBy=topiaCreateDate desc - -fr.ifremer.wao.entity.SampleRowLog.attribute.author.tagValue.lazy=false - -fr.ifremer.wao.entity.FishingZone.attribute.sampleRow.tagValue.orderBy=code - -#fr.ifremer.wao.entity.Boat.attribute.shipOwner.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy=false -fr.ifremer.wao.entity.Boat.attribute.elligibleBoat.tagValue.orderBy=companyActive - -fr.ifremer.wao.entity.ElligibleBoat.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.Contact.attribute.sampleRow.tagValue.lazy=false -fr.ifremer.wao.entity.Contact.attribute.boat.tagValue.lazy=false - -fr.ifremer.wao.entity.TerrestrialDivision.attribute.regionIfremer.tagValue.lazy=false - -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.lazy=false -fr.ifremer.wao.entity.IndicatorLog.attribute.author.tagValue.lazy=false -fr.ifremer.wao.entity.Indicator.attribute.indicatorLevel.tagValue.orderBy=level - -fr.ifremer.wao.entity.SampleRow.attribute.observers.tagValue.inverse=false -fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse=true - -fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique=true Deleted: trunk/wao-persistence/src/main/xmi/wao.zargo =================================================================== (Binary files differ)