Author: tchemit Date: 2011-11-15 09:40:07 +0100 (Tue, 15 Nov 2011) New Revision: 82 Url: http://forge.codelutin.com/repositories/revision/echobase/82 Log: update models Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ImportModel.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java trunk/src/doc/EchoBAse_structure_V3.mm Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-15 08:40:07 UTC (rev 82) @@ -22,7 +22,13 @@ echobase.common.calibrationProcessingMethod= echobase.common.calibrationReport= echobase.common.callsign= +echobase.common.category= +echobase.common.categoryMeaning= +echobase.common.categoryRef= +echobase.common.categoryType= +echobase.common.categoryValue= echobase.common.cell=cell +echobase.common.cellMethod= echobase.common.cellMethods= echobase.common.cellName= echobase.common.cellType= @@ -36,6 +42,7 @@ echobase.common.dataCentre= echobase.common.dataCentreEmail= echobase.common.dataMetadata= +echobase.common.dataMetadataName= echobase.common.dataName= echobase.common.dataProcessing=dataProcessing echobase.common.dataQuality=dataQuality @@ -48,6 +55,7 @@ echobase.common.depthStratum=depthStratum echobase.common.depthStratumId= echobase.common.depthStratumMeaning= +echobase.common.depthStratumType= echobase.common.description=Description echobase.common.digitThreshold= echobase.common.distributionStatement= @@ -78,6 +86,7 @@ echobase.common.id=Identifiant echobase.common.institution= echobase.common.keywords= +echobase.common.label= echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification echobase.common.lengthClass=lengthClass @@ -169,6 +178,7 @@ echobase.common.transitEndTime= echobase.common.transitStartLocality= echobase.common.transitStartTime= +echobase.common.transitVessel= echobase.common.units= echobase.common.user=Utilisateur echobase.common.validMax= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2011-11-15 08:40:07 UTC (rev 82) @@ -28,7 +28,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.decorator.Decorator; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2011-11-15 08:40:07 UTC (rev 82) @@ -29,7 +29,7 @@ import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/VoyageService.java 2011-11-15 08:40:07 UTC (rev 82) @@ -25,8 +25,8 @@ import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; -import fr.ifremer.echobase.entities.Voyage; -import fr.ifremer.echobase.entities.VoyageDAO; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.VoyageDAO; import org.nuiton.topia.TopiaException; import java.util.List; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ImportModel.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ImportModel.java 2011-11-15 08:40:07 UTC (rev 82) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.services.models; -import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-15 08:40:07 UTC (rev 82) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions; import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.VoyageService; import fr.ifremer.echobase.services.models.ImportModel; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/CreateEmbeddedApplication.java 2011-11-15 08:40:07 UTC (rev 82) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions.export; import fr.ifremer.echobase.EchoBaseConfiguration; -import fr.ifremer.echobase.entities.Voyage; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.VoyageService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.nuiton.util.Version; Modified: trunk/src/doc/EchoBAse_structure_V3.mm =================================================================== --- trunk/src/doc/EchoBAse_structure_V3.mm 2011-11-14 16:38:34 UTC (rev 81) +++ trunk/src/doc/EchoBAse_structure_V3.mm 2011-11-15 08:40:07 UTC (rev 82) @@ -32,7 +32,7 @@ </node> <node CREATED="1320672768627" ID="Freemind_Link_1234421627" MODIFIED="1320685375595" TEXT="One-to-many link to" VSHIFT="-111"> <font ITALIC="true" NAME="SansSerif" SIZE="12"/> -<node CREATED="1320414374515" ID="_" MODIFIED="1320685406626" TEXT="Voyage"> +<node CREATED="1320414374515" ID="_" MODIFIED="1321279147118" TEXT="Voyage"> <font BOLD="true" NAME="SansSerif" SIZE="12"/> <node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> <font BOLD="true" ITALIC="true" NAME="SansSerif" SIZE="12"/> @@ -68,14 +68,14 @@ <font BOLD="true" ITALIC="true" NAME="SansSerif" SIZE="12"/> <node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> <font ITALIC="true" NAME="SansSerif" SIZE="12"/> -<node CREATED="1320673346795" FOLDED="true" ID="Freemind_Link_1110771553" MODIFIED="1321267793459" TEXT="AcousticInstrument"> +<node CREATED="1320673346795" FOLDED="true" ID="Freemind_Link_1110771553" MODIFIED="1321279169442" TEXT="AcousticInstrument"> <font BOLD="true" NAME="SansSerif" SIZE="12"/> <node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> <font BOLD="true" ITALIC="true" NAME="SansSerif" SIZE="12"/> </node> <node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> <font BOLD="true" ITALIC="true" NAME="SansSerif" SIZE="12"/> -<node CREATED="1320745727927" ID="Freemind_Link_1071765877" MODIFIED="1321262359489" TEXT="Many-to-one link"> +<node CREATED="1320745727927" FOLDED="true" ID="Freemind_Link_1071765877" MODIFIED="1321279165592" TEXT="Many-to-one link"> <font ITALIC="true" NAME="SansSerif" SIZE="12"/> <node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> <font BOLD="true" NAME="SansSerif" SIZE="12"/> @@ -345,8 +345,8 @@ <node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="ProcessingSoftwareVersion"/> <node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingSacorrection"/> <node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorption"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorptionDescription"/> -<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingPsi"/> +<node CREATED="1320687449754" ID="ID_818807184" MODIFIED="1320687449754" TEXT="TransceiverProcessingAbsorptionDescription"/> +<node CREATED="1320687449754" ID="ID_1634165222" MODIFIED="1320687449754" TEXT="TransducerProcessingPsi"/> <node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAthwartship"/> <node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAlongship"/> <node CREATED="1320687449754" ID="Freemind_Link_245146210" MODIFIED="1320687449754" TEXT="AcousticDensityUnit"/>