- Echobase-commits - mailman.cloud.codelutin.com

r82 - in trunk: echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/models echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export src/doc
by tchemit＠users.forge.codelutin.com Nov. 15, 2011

Nov. 15, 2011

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"> -<node CREATED="1320414374515" ID="_" MODIFIED="1320685406626" TEXT="Voyage"> +<node CREATED="1320414374515" ID="_" MODIFIED="1321279147118" TEXT="Voyage"> <node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> @@ -68,14 +68,14 @@ <node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> -<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"> <node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> </node> <node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> -<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"> <node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> @@ -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"/>

1 0

r81 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/models echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources/config echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources/i18n echobase-ui/src/main/webapp/WEB-INF/jsp/import
by sletellier＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: sletellier Date: 2011-11-14 17:38:34 +0100 (Mon, 14 Nov 2011) New Revision: 81 Url: http://forge.codelutin.com/repositories/revision/echobase/81 Log: - Add content type in import model - Add validation message traduction - Fix import validation Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml Modified: 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/resources/config/struts-import.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 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 15:09:26 UTC (rev 80) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ImportModel.java 2011-11-14 16:38:34 UTC (rev 81) @@ -43,28 +43,28 @@ protected Voyage selectedVoyage; protected File accessImport; - protected String accessImportFileName; + protected String accessImportContentType; protected File accousticImport; - protected String accousticImportFileName; + protected String accousticImportContentType; protected File pecherieImport; - protected String pecherieImportFileName; + protected String pecherieImportContentType; protected File lectureAgeGenImport; - protected String lectureAgeGenImportFileName; + protected String lectureAgeGenImportContentType; protected File eventsImport; - protected String eventsImportFileName; + protected String eventsImportContentType; protected File typeEchoSpeciesImport; - protected String typeEchoSpeciesImportFileName; + protected String typeEchoSpeciesImportContentType; protected String comment; @@ -104,6 +104,14 @@ this.accessImportFileName = accessImportFileName; } + public String getAccessImportContentType() { + return accessImportContentType; + } + + public void setAccessImportContentType(String accessImportContentType) { + this.accessImportContentType = accessImportContentType; + } + public File getAccousticImport() { return accousticImport; } @@ -120,6 +128,14 @@ this.accousticImportFileName = accousticImportFileName; } + public String getAccousticImportContentType() { + return accousticImportContentType; + } + + public void setAccousticImportContentType(String accousticImportContentType) { + this.accousticImportContentType = accousticImportContentType; + } + public File getPecherieImport() { return pecherieImport; } @@ -136,6 +152,14 @@ this.pecherieImportFileName = pecherieImportFileName; } + public String getPecherieImportContentType() { + return pecherieImportContentType; + } + + public void setPecherieImportContentType(String pecherieImportContentType) { + this.pecherieImportContentType = pecherieImportContentType; + } + public File getLectureAgeGenImport() { return lectureAgeGenImport; } @@ -152,6 +176,14 @@ this.lectureAgeGenImportFileName = lectureAgeGenImportFileName; } + public String getLectureAgeGenImportContentType() { + return lectureAgeGenImportContentType; + } + + public void setLectureAgeGenImportContentType(String lectureAgeGenImportContentType) { + this.lectureAgeGenImportContentType = lectureAgeGenImportContentType; + } + public File getEventsImport() { return eventsImport; } @@ -168,6 +200,14 @@ this.eventsImportFileName = eventsImportFileName; } + public String getEventsImportContentType() { + return eventsImportContentType; + } + + public void setEventsImportContentType(String eventsImportContentType) { + this.eventsImportContentType = eventsImportContentType; + } + public File getTypeEchoSpeciesImport() { return typeEchoSpeciesImport; } @@ -184,6 +224,14 @@ this.typeEchoSpeciesImportFileName = typeEchoSpeciesImportFileName; } + public String getTypeEchoSpeciesImportContentType() { + return typeEchoSpeciesImportContentType; + } + + public void setTypeEchoSpeciesImportContentType(String typeEchoSpeciesImportContentType) { + this.typeEchoSpeciesImportContentType = typeEchoSpeciesImportContentType; + } + public boolean validate() { // access file or survey is selected, not both 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 15:09:26 UTC (rev 80) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-14 16:38:34 UTC (rev 81) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.ui.actions; +import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.entities.Voyage; import fr.ifremer.echobase.services.VoyageService; import fr.ifremer.echobase.services.models.ImportModel; @@ -38,7 +39,7 @@ * @author sletellier <letellier(a)codelutin.com> * @since 0.1 */ -public class ImportAction extends EchoBaseActionSupport { +public class ImportAction extends EchoBaseActionSupport implements Preparable { private static final long serialVersionUID = 1L; @@ -71,18 +72,15 @@ } @Override - public String input() throws Exception { - + public void prepare() throws Exception { VoyageService service = newService(VoyageService.class); List<Voyage> allVoyages = service.getVoyages(); voyages = sortAndDecorate(allVoyages, null); - - return INPUT; } @Override public String execute() throws Exception { - log.info("Will import : " + importModel.toString()); + log.info("Will import : " + getImportModel().toString()); return SUCCESS; } Modified: trunk/echobase-ui/src/main/resources/config/struts-import.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-import.xml 2011-11-14 15:09:26 UTC (rev 80) +++ trunk/echobase-ui/src/main/resources/config/struts-import.xml 2011-11-14 16:38:34 UTC (rev 81) @@ -36,13 +36,13 @@ <action name="import" class="fr.ifremer.echobase.ui.actions.ImportAction" method="input"> <result name="input">/WEB-INF/jsp/import/import.jsp</result> - <result type="redirectAction">doImport</result> </action>  <action name="doImport" class="fr.ifremer.echobase.ui.actions.ImportAction"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> - <result name="wait">/WEB-INF/jsp/import/importProgress.jsp</result> +  + <result name="input">/WEB-INF/jsp/import/import.jsp</result> <result>/WEB-INF/jsp/import/importProgress.jsp</result> </action> Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml (from rev 78, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-doImport-validation.xml 2011-11-14 16:38:34 UTC (rev 81) @@ -0,0 +1,56 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="query.name"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.name.requiredstring"/> + </field-validator> + </field> + + <field name="query.description"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.description.requiredstring"/> + </field-validator> + </field> + + <field name="query.sqlQuery"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.sqlQuery.requiredstring"/> + </field-validator> + <field-validator type="regex"> +  + <param name="expression">^\s*select\s+.+\s+from\s+.+$</param> + <param name="caseSensitive">false</param> + <message key="echobase.validation.export.sqlQuery.wrongformat"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml 2011-11-14 15:09:26 UTC (rev 80) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml 2011-11-14 16:38:34 UTC (rev 81) @@ -1,45 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="importModel.selectedVoyage"> - - <field-validator type="fieldexpression"> - <param name="expression">importModel.accessImport == null</param> - <message key="echobase.validation.import.selectedVoyageOrAccessImport.required"/> - </field-validator> - </field> - - <field name="importModel.accessImport"> - - <field-validator type="fieldexpression"> - <param name="expression">importModel.selectedVoyage == null</param> - <message key="echobase.validation.import.selectedVoyageOrAccessImport.required"/> - </field-validator> - </field> - -</validators> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-14 15:09:26 UTC (rev 80) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-14 16:38:34 UTC (rev 81) @@ -89,4 +89,11 @@ echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs echobase.user.gridTitle=Liste des utilisateurs +echobase.validation.export.description.requiredstring=La description de l'export est obligatoire +echobase.validation.export.name.requiredstring=Le nom de l'export est obligatoire +echobase.validation.export.sqlQuery.requiredstring=La requête de l'export est obligatoire +echobase.validation.export.sqlQuery.wrongformat=La requêtes n'est pas valide +echobase.validation.import.selectedVoyageOrAccessImport.required=Merci de selectionner un voyage ou un import access +echobase.validation.login.password.requiredstring=Le mot de passe est obligatoire +echobase.validation.login.wrongLogin=Le login est déjà utilisé echobase.voyage.selectHeader=Selectionnez un voyage Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 15:09:26 UTC (rev 80) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 16:38:34 UTC (rev 81) @@ -26,7 +26,7 @@ <title><s:text name="echobase.title.import"/></title> -<s:form id="importForm" action="import" namespace="/import" method="POST" +<s:form id="importForm" action="doImport" namespace="/import" method="POST" enctype="multipart/form-data"> <fieldset>

1 0

r80 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export echobase-ui/src/main/resources echobase-ui/src/main/resources/config echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources/fr/ifremer/echob
by tchemit＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: tchemit Date: 2011-11-14 16:09:26 +0100 (Mon, 14 Nov 2011) New Revision: 80 Url: http://forge.codelutin.com/repositories/revision/echobase/80 Log: - make export sql validation works - add svn properties - add missing entity stereotype on model - add configuration constants Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-saveExportQuery-validation.xml Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSql.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 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/UserService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSqlResult.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java trunk/echobase-ui/src/main/resources/config/struts-export.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml trunk/echobase-ui/src/main/resources/log4j.properties trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-14 15:09:26 UTC (rev 80) @@ -51,6 +51,10 @@ protected static final Log log = LogFactory.getLog(EchoBaseConfiguration.class); + public static final String OPTION_CREATE_ADMINS = "createAdmins"; + + public static final String OPTION_UPDATE_SCHEMA = "updateSchema"; + /** Delegate application config object containing configuration. */ protected ApplicationConfig applicationConfig; 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 13:55:41 UTC (rev 79) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-14 15:09:26 UTC (rev 80) @@ -162,6 +162,7 @@ echobase.common.transducerSerial= echobase.common.transect=transect echobase.common.transectAbstract= +echobase.common.transectAcousticInstrument= echobase.common.transit=transit echobase.common.transitDescription= echobase.common.transitEndLocatlity= @@ -179,6 +180,7 @@ echobase.common.vesselName= echobase.common.vesselNoiseDesign= echobase.common.vesselTonnage= +echobase.common.vesselTransit= echobase.common.vesselType= echobase.common.voyage=Campagne echobase.common.voyageDescription= Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2011-11-14 15:09:26 UTC (rev 80) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; +import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -144,7 +145,7 @@ userDTO.setAdmin(true); createOrUpdate(userDTO); - if (getConfiguration().getOptionAsBoolean("createAdmins")) { + if (getConfiguration().getOptionAsBoolean(EchoBaseConfiguration.OPTION_CREATE_ADMINS)) { for (int i = 0; i < 1000; i++) { userDTO = new EchoBaseUserDTOImpl(); userDTO.setEmail(DEFAULT_ADMIN_EMAIL + i); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2011-11-14 15:09:26 UTC (rev 80) @@ -122,7 +122,7 @@ try { boolean schemaExist = isSchemaCreated(); if (!schemaExist || - configuration.getOptionAsBoolean("updateSchema")) { + configuration.getOptionAsBoolean(EchoBaseConfiguration.OPTION_UPDATE_SCHEMA)) { updateSchema(configuration); } Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSql.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSql.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSql.java 2011-11-14 15:09:26 UTC (rev 80) @@ -1,92 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * 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% - */ -package fr.ifremer.echobase.ui.actions.export; - -import fr.ifremer.echobase.entities.ExportQuery; -import fr.ifremer.echobase.entities.ExportQueryImpl; -import fr.ifremer.echobase.services.ExportSqlService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang3.StringUtils; - -import java.util.Collection; -import java.util.Map; - -/** - * Load export sql main page. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 - */ -public class ExportSql extends EchoBaseActionSupport { - - private static final long serialVersionUID = 1L; - - /** All available queries from database. */ - protected Map<String, String> queries; - - /** Selected query loaded from database if his id is not empty. */ - protected ExportQuery query; - - public ExportQuery getQuery() { - if (query == null) { - query = new ExportQueryImpl(); - } - return query; - } - - public Map<String, String> getQueries() { - return queries; - } - - public Map<String, String> getTableNames() { - return queries; - } - - @Override - public String execute() throws Exception { - ExportSqlService service = newService(ExportSqlService.class); - - Collection<ExportQuery> sqlQueries = service.getQueries(); - queries = sortAndDecorate(sqlQueries, null); - - if (sqlQueries.isEmpty()) { - // no query saved - addActionMessage(_("echobase.info.no.sqlQuery.saved")); - } - - String selectedQueryId = getQuery().getTopiaId(); - - if (StringUtils.isEmpty(selectedQueryId)) { - - // no query selected - addActionMessage(_("echobase.info.no.sqlQuery.selected")); - } else { - - // load query from database - query = service.getQueryById(selectedQueryId); - } - return SUCCESS; - } - -} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSqlResult.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSqlResult.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ExportSqlResult.java 2011-11-14 15:09:26 UTC (rev 80) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.export; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.services.ExportSqlService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; @@ -66,8 +67,14 @@ // obtain columNames from the request ExportSqlService service = newService(ExportSqlService.class); - columnNames = service.getColumnNames(sql); + try { + columnNames = service.getColumnNames(sql); + } catch (EchoBaseTechnicalException e) { + //TODO add a real nice message + addActionError(e.getMessage()); + } + // create default file name fileName = "export.csv"; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/export/ManageExportQuery.java 2011-11-14 15:09:26 UTC (rev 80) @@ -23,22 +23,30 @@ */ package fr.ifremer.echobase.ui.actions.export; +import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.ExportQueryImpl; import fr.ifremer.echobase.services.ExportSqlService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.lang3.StringUtils; +import java.util.Collection; +import java.util.Map; + /** * To manage {@link ExportQuery}. * * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class ManageExportQuery extends EchoBaseActionSupport { +public class ManageExportQuery extends EchoBaseActionSupport implements Preparable { private static final long serialVersionUID = 1L; - /** Selected query */ + /** All available queries from database. */ + protected Map<String, String> queries; + + /** Selected query loaded from database if his id is not empty. */ protected ExportQuery query; public ExportQuery getQuery() { @@ -48,6 +56,14 @@ return query; } + public Map<String, String> getQueries() { + return queries; + } + + public Map<String, String> getTableNames() { + return queries; + } + public String saveQuery() throws Exception { //TODO : do validation @@ -79,4 +95,29 @@ query = null; return SUCCESS; } + + @Override + public void prepare() throws Exception { + ExportSqlService service = newService(ExportSqlService.class); + + Collection<ExportQuery> sqlQueries = service.getQueries(); + queries = sortAndDecorate(sqlQueries, null); + + if (sqlQueries.isEmpty()) { + // no query saved + addActionMessage(_("echobase.info.no.sqlQuery.saved")); + } + + String selectedQueryId = getQuery().getTopiaId(); + + if (StringUtils.isEmpty(selectedQueryId)) { + + // no query selected + addActionMessage(_("echobase.info.no.sqlQuery.selected")); + } else { + + // load query from database + query = service.getQueryById(selectedQueryId); + } + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/config/struts-export.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-export.xml 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/resources/config/struts-export.xml 2011-11-14 15:09:26 UTC (rev 80) @@ -38,12 +38,14 @@ <param name="namespace">export</param> <param name="query.topiaId">${query.topiaId}</param> </result-type> + </result-types>  - <action name="exportSql" - class="fr.ifremer.echobase.ui.actions.export.ExportSql"> - <result>/WEB-INF/jsp/export/exportSql.jsp</result> + <action name="exportSql" method="input" + class="fr.ifremer.echobase.ui.actions.export.ManageExportQuery"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/export/exportSql.jsp</result> </action>  @@ -67,24 +69,31 @@  <action name="cloneExportQuery" method="cloneQuery" class="fr.ifremer.echobase.ui.actions.export.ManageExportQuery"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/export/exportSql.jsp</result> <result type="redirectExportSql"/> </action>  <action name="saveExportQuery" method="saveQuery" class="fr.ifremer.echobase.ui.actions.export.ManageExportQuery"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/export/exportSql.jsp</result> <result type="redirectExportSql"/> </action>  <action name="deleteExportQuery" method="deleteQuery" class="fr.ifremer.echobase.ui.actions.export.ManageExportQuery"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <result name="input">/WEB-INF/jsp/export/exportSql.jsp</result> <result type="redirectExportSql"/> </action>  <action name="downloadExportSqlResult" class="fr.ifremer.echobase.ui.actions.export.DownloadExportSqlResult"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> @@ -95,6 +104,7 @@  <action name="downloadEmbeddedApplication" class="fr.ifremer.echobase.ui.actions.export.DownloadEmbeddedApplication"> + <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml 2011-11-14 15:09:26 UTC (rev 80) @@ -1,56 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="query.name"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.name.requiredstring"/> - </field-validator> - </field> - - <field name="query.description"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.description.requiredstring"/> - </field-validator> - </field> - - <field name="query.sqlQuery"> - - <field-validator type="requiredstring"> - <message key="echobase.validation.export.sqlQuery.requiredstring"/> - </field-validator> - <field-validator type="regex"> -  - <param name="expression">^\s*select\s+.+\s+from\s+.+$</param> - <param name="caseSensitive">false</param> - <message key="echobase.validation.export.sqlQuery.wrongformat"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-saveExportQuery-validation.xml (from rev 78, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-saveExportQuery-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-saveExportQuery-validation.xml 2011-11-14 15:09:26 UTC (rev 80) @@ -0,0 +1,56 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="query.name"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.name.requiredstring"/> + </field-validator> + </field> + + <field name="query.description"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.description.requiredstring"/> + </field-validator> + </field> + + <field name="query.sqlQuery"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.sqlQuery.requiredstring"/> + </field-validator> + <field-validator type="regex"> +  + <param name="expression">^\s*select\s+.+\s+from\s+.+$</param> + <param name="caseSensitive">false</param> + <message key="echobase.validation.export.sqlQuery.wrongformat"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-saveExportQuery-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/resources/log4j.properties 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/resources/log4j.properties 2011-11-14 15:09:26 UTC (rev 80) @@ -22,7 +22,7 @@ # #L% ### # Default to info level output; this is very handy if you eventually use Hibernate as well. -log4j.rootCategory=info, A1 +log4j.rootCategory=WARN, A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender @@ -33,6 +33,3 @@ # Toute l'application log4j.logger.fr.ifremer.echobase=INFO - -log4j.logger.com.opensymphony.xwork2.validator.ValidationInterceptor=DEBUG -log4j.logger.org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor=DEBUG \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSql.jsp 2011-11-14 15:09:26 UTC (rev 80) @@ -27,6 +27,7 @@ <s:url id="reloadUrl" action='exportSql' namespace='/export'/> <s:url id="exportSqlResultUrl" action="exportSqlResult" namespace="/export"/> +<s:set var="noError" value="!hasErrors()"/> <script type="text/javascript"> function reloadQuery() { @@ -57,7 +58,7 @@ }); var queryId = $('[name="query.topiaId"]').val(); - if (queryId) { + if (queryId && ${noError}) { // auto launch query loadGridData(); } Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-14 13:55:41 UTC (rev 79) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/exportSqlResult.jsp 2011-11-14 15:09:26 UTC (rev 80) @@ -26,39 +26,47 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<s:url id="loadUrl" action="getExportSqlResult" namespace="/export" - escapeAmp="false"> - <s:param name="sql" value="%{sql}"/> -</s:url> +<s:if test="hasActionErrors()"> + <div class="info_error"> + <s:actionerror/> + </div> +</s:if> +<s:else> + <s:url id="loadUrl" action="getExportSqlResult" namespace="/export" + escapeAmp="false"> + <s:param name="sql" value="%{sql}"/> + </s:url> -<s:form action="downloadExportSqlResult" namespace="/export"> + <s:form action="downloadExportSqlResult" namespace="/export"> - <fieldset> - <legend><s:text name="echobase.sqlQuery.result"/></legend> + <fieldset> + <legend><s:text name="echobase.sqlQuery.result"/></legend> - <s:hidden key="sql" label=""/> - <s:textfield key="fileName" required="true" size="100" - label="%{getText('echobase.common.exportFileName')}"/> - <s:submit key="echobase.action.exportSqlData" align="left"/> - -<sjg:grid id="rows" caption="%{getText('echobase.common.request.result')}" - dataType="json" href="%{loadUrl}" gridModel="datas" - pager="true" pagerButtons="true" pagerInput="true" - navigator="true" autowidth="true" rownumbers="false" - navigatorEdit="false" navigatorDelete="false" - navigatorSearch="false" navigatorRefresh="false" - navigatorAdd="false" rowList="10,15,20,50" rowNum="10" - viewrecords="true"> + <s:hidden key="sql" label=""/> + <s:textfield key="fileName" required="true" size="100" + label="%{getText('echobase.common.exportFileName')}"/> + <s:submit key="echobase.action.exportSqlData" align="left"/> + + <sjg:grid id="rows" caption="%{getText('echobase.common.request.result')}" + dataType="json" href="%{loadUrl}" gridModel="datas" + pager="true" pagerButtons="true" pagerInput="true" + navigator="true" autowidth="true" rownumbers="false" + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" rowList="10,15,20,50" rowNum="10" + viewrecords="true"> - <s:iterator value="columnNames" var="name" status="status"> + <s:iterator value="columnNames" var="name" status="status"> - <sjg:gridColumn name="%{#name}" title="%{#name}" sortable="false"/> + <sjg:gridColumn name="%{#name}" title="%{#name}" sortable="false"/> - </s:iterator> + </s:iterator> -</sjg:grid> - </fieldset> -</s:form> + </sjg:grid> + </fieldset> + </s:form> +</s:else> +

1 0

r79 - trunk/src/doc
by tchemit＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: tchemit Date: 2011-11-14 14:55:41 +0100 (Mon, 14 Nov 2011) New Revision: 79 Url: http://forge.codelutin.com/repositories/revision/echobase/79 Log: add model in doc Added: trunk/src/doc/EchoBAse_structure_V3.mm Added: trunk/src/doc/EchoBAse_structure_V3.mm =================================================================== --- trunk/src/doc/EchoBAse_structure_V3.mm (rev 0) +++ trunk/src/doc/EchoBAse_structure_V3.mm 2011-11-14 13:55:41 UTC (rev 79) @@ -0,0 +1,493 @@ +<map version="0.9.0"> + +<node CREATED="1320414227374" ID="Freemind_Link_1816719942" MODIFIED="1320672696096" TEXT="EchoBase"> +<node CREATED="1320672662112" ID="Freemind_Link_1000684081" MODIFIED="1320860303674" POSITION="right" TEXT="Mission"> + +<node CREATED="1320745945873" ID="Freemind_Link_1647670071" MODIFIED="1320764161103" TEXT="MissionID"> + +<node CREATED="1320745964653" FOLDED="true" ID="Freemind_Link_530449074" MODIFIED="1321267280211" TEXT="Many-to-one link"> + +<node CREATED="1320745976558" ID="Freemind_Link_891298930" MODIFIED="1321266920835" TEXT="MissionList"> + +<node CREATED="1320684060854" ID="Freemind_Link_1153370841" MODIFIED="1320684060854" TEXT="MissionID"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionName"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigator"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="MissionAbstract"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Project"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Platform"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Institution"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Keywords"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="References"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentre"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DataCentreEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="AuthorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Author"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="PrincipalInvestigatorEmail"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationReferences"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="DistributionStatement"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="OrganisationLevelAcknowledgements"/> +<node CREATED="1320684060854" MODIFIED="1320684060854" TEXT="Source"/> +</node> +</node> +<node CREATED="1320672768627" ID="Freemind_Link_1234421627" MODIFIED="1320685375595" TEXT="One-to-many link to" VSHIFT="-111"> + +<node CREATED="1320414374515" ID="_" MODIFIED="1320685406626" TEXT="Voyage"> + +<node CREATED="1320762754281" ID="Freemind_Link_876869769" MODIFIED="1320764179800" TEXT="MissionID"> + +</node> +<node CREATED="1320684811880" ID="Freemind_Link_963065985" MODIFIED="1321267291908" TEXT="VoyageID"> + +<node CREATED="1320684816474" ID="Freemind_Link_177695531" MODIFIED="1320685436392" TEXT="One-to-many link to"> + +<node CREATED="1320414383327" ID="Freemind_Link_665386905" MODIFIED="1320685411705" TEXT="Transit"> + +<node CREATED="1320762730642" ID="Freemind_Link_1859969644" MODIFIED="1320852106660" TEXT="VoyageID"> + +</node> +<node CREATED="1320684878145" ID="Freemind_Link_490342294" MODIFIED="1321267746739" TEXT="TransitID"> + +<node CREATED="1320747560871" ID="Freemind_Link_745070343" MODIFIED="1320762973603" TEXT="One-to-many link"> + +<node CREATED="1320763829630" ID="Freemind_Link_970203878" MODIFIED="1320763931218" TEXT="Vessel"> + +<node CREATED="1320763845242" ID="Freemind_Link_1797338913" MODIFIED="1320764204507" TEXT="TransitID"> + +</node> +<node CREATED="1320763855837" ID="Freemind_Link_136076903" MODIFIED="1320764208783" TEXT="VesselTransitID"> + +<node CREATED="1320763886127" ID="Freemind_Link_1670236489" MODIFIED="1320763937139" TEXT="One-to-many link to"> + +<node CREATED="1320680415734" ID="Freemind_Link_1606755930" MODIFIED="1321270303019" TEXT="Transect"> + +<node CREATED="1320685767018" ID="Freemind_Link_1002340991" MODIFIED="1320764225593" TEXT="VesselTransitID"> + +</node> +<node CREATED="1320687033637" ID="Freemind_Link_1677143617" MODIFIED="1321262245668" TEXT="TransectID"> + +<node CREATED="1320680989887" ID="Freemind_Link_435190659" MODIFIED="1320685813293" TEXT="One-to-many link"> + +<node CREATED="1320673346795" FOLDED="true" ID="Freemind_Link_1110771553" MODIFIED="1321267793459" TEXT="AcousticInstrument"> + +<node CREATED="1320687033637" ID="Freemind_Link_443830258" MODIFIED="1320764239015" TEXT="TransectID"> + +</node> +<node CREATED="1320686503938" ID="Freemind_Link_238706726" MODIFIED="1320764243011" TEXT="AcousticInstrumentID"> + +<node CREATED="1320745727927" ID="Freemind_Link_1071765877" MODIFIED="1321262359489" TEXT="Many-to-one link"> + +<node CREATED="1320745784879" ID="Freemind_Link_286667586" MODIFIED="1321262374168" TEXT="AcousticInstrumentsList"> + +<node CREATED="1320745762942" FOLDED="true" ID="Freemind_Link_727094002" MODIFIED="1320765279424" TEXT="AcousticInstrumentID"> + +<node CREATED="1320763409765" FOLDED="true" ID="Freemind_Link_845278257" MODIFIED="1320763442137" TEXT="One-to-many link to"> + +<node CREATED="1320673020781" FOLDED="true" ID="Freemind_Link_611849017" MODIFIED="1320686066337" TEXT="Calibration"> + +<node CREATED="1320763424873" ID="Freemind_Link_69157462" MODIFIED="1320763433075" TEXT="AcousticInstrumentID"/> +<node CREATED="1320747868138" ID="Freemind_Link_55028634" MODIFIED="1320747868138" TEXT="CalibrationDate"/> +<node CREATED="1320747868138" MODIFIED="1320747868138" TEXT="CalibrationAquisitionMethod"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationProcessingMethod"/> +<node CREATED="1320747868154" ID="Freemind_Link_840605646" MODIFIED="1320747903166" TEXT="CalibrationAccuracyEstimate"/> +<node CREATED="1320747868154" MODIFIED="1320747868154" TEXT="CalibrationReport"/> +</node> +</node> +</node> +<node CREATED="1320686503938" ID="Freemind_Link_394789408" MODIFIED="1320686503938" TEXT="TransceiverModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="Frequency"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverManufacturer"/> +<node CREATED="1320686503938" ID="Freemind_Link_212611503" MODIFIED="1320686503938" TEXT="TransceiverBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverAperture"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransceiverFirmware"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerLocation"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerModel"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerBeams"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerSerial"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerDepth"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="TransducerOrientation"/> +<node CREATED="1320686503938" ID="ID_732575667" MODIFIED="1320686503938" TEXT="TransducerAperture"/> +</node> +</node> +</node> +<node CREATED="1320763307134" ID="Freemind_Link_1299225898" MODIFIED="1321262511515" TEXT="TransectAcousticInstrumentID"> + +<node CREATED="1320672852954" ID="Freemind_Link_963421402" MODIFIED="1320686042966" TEXT="One-to-many link to"> + +<node CREATED="1320414424952" ID="Freemind_Link_538841928" MODIFIED="1320857866415" TEXT="DataAcquisition"> + +<node CREATED="1320747986251" ID="Freemind_Link_1357656705" MODIFIED="1320764253280" TEXT="TransectAcousticInstrumentID"> + +</node> +<node CREATED="1320745617789" ID="Freemind_Link_1153043747" MODIFIED="1320764256324" TEXT="DataAcquisitionID"> + +<node CREATED="1320677282598" ID="Freemind_Link_1607624977" MODIFIED="1320686837580" TEXT="One-to-many link to"> + +<node CREATED="1320414432296" ID="Freemind_Link_1091633171" MODIFIED="1321262915412" TEXT="DataProcessing"> + +<node CREATED="1320687449739" ID="Freemind_Link_1324961543" MODIFIED="1320764263456" TEXT="DataAcquisitionID"> + +</node> +<node CREATED="1320687449739" ID="Freemind_Link_201776742" MODIFIED="1320764266172" TEXT="DataProcessingID"> + +<node CREATED="1320673208905" ID="Freemind_Link_156379983" MODIFIED="1320688102449" TEXT="One-to-many link to"> + +<node CREATED="1320672573112" ID="Freemind_Link_1187226973" MODIFIED="1320688575521" TEXT="Cells"> + +<node CREATED="1320689289481" ID="Freemind_Link_1436627817" MODIFIED="1320764272150" TEXT="DataProcessingID"> + +</node> +<node CREATED="1320689289481" FOLDED="true" ID="Freemind_Link_1878671348" MODIFIED="1321266194271" TEXT="CellID"> + +<node CREATED="1320674375210" ID="Freemind_Link_1290486014" MODIFIED="1320777516520" TEXT="One-to-many link to"> + +<node CREATED="1320672567894" ID="Freemind_Link_841358874" MODIFIED="1321263447057" TEXT="Data"> + +<node CREATED="1320689340027" ID="Freemind_Link_747297790" MODIFIED="1320764278206" TEXT="CellID"> + +</node> +<node CREATED="1320689419510" ID="Freemind_Link_1643361049" MODIFIED="1320764281124" TEXT="DataID"> + +</node> +<node CREATED="1320689419510" ID="Freemind_Link_1668121639" MODIFIED="1321263579640" TEXT="DataMetadataID"> + +<node CREATED="1320672322833" ID="Freemind_Link_130498975" MODIFIED="1320745330331" TEXT="Many-to-one link"> + +<node CREATED="1320748100990" ID="Freemind_Link_734830668" MODIFIED="1320764048479" TEXT="DataMetadataList"> + +<node CREATED="1320688066746" ID="Freemind_Link_879034643" MODIFIED="1320765746122" TEXT="DataMetadataID"> + +</node> +<node CREATED="1320688066746" FOLDED="true" ID="Freemind_Link_1565536956" MODIFIED="1321265163466" TEXT="Name"> +<node CREATED="1320846301889" ID="Freemind_Link_618319869" MODIFIED="1320846315217" TEXT="Longitude"/> +<node CREATED="1320846318342" ID="Freemind_Link_505475955" MODIFIED="1320846320935" TEXT="Latitude"/> +<node CREATED="1320689289481" ID="Freemind_Link_616331607" MODIFIED="1320689289481" TEXT="Time"/> +<node CREATED="1320846355529" ID="Freemind_Link_115361487" MODIFIED="1320846362138" TEXT="Depth"/> +<node CREATED="1320846364935" ID="Freemind_Link_131576363" MODIFIED="1320846373716" TEXT="sA"/> +<node CREATED="1320846379419" ID="Freemind_Link_1430641887" MODIFIED="1320846384263" TEXT="En"/> +<node CREATED="1320846387638" ID="Freemind_Link_672404029" MODIFIED="1320846412559" TEXT="EchotypesA"/> +<node CREATED="1320776631802" ID="Freemind_Link_1709224036" MODIFIED="1320847088378" TEXT="ReferenceStationCatch"> + +</node> +<node CREATED="1320776631802" ID="Freemind_Link_843483909" MODIFIED="1320847091425" TEXT="ReferenceStationBiometry"> + +</node> +<node CREATED="1320846599122" ID="Freemind_Link_1498920698" MODIFIED="1320846602840" TEXT="Volume"/> +<node CREATED="1320846605872" ID="Freemind_Link_269579553" MODIFIED="1320846609091" TEXT="Surface"/> +<node CREATED="1320940774914" ID="Freemind_Link_1893670437" MODIFIED="1320940780257" TEXT="Formula"/> +<node CREATED="1320937143600" ID="Freemind_Link_1770201193" MODIFIED="1320937143600" TEXT="Biomass"/> +<node CREATED="1320937143600" ID="ID_116004232" MODIFIED="1320937143600" TEXT="Abundance"/> +<node CREATED="1320937143600" ID="Freemind_Link_946641490" MODIFIED="1320937143600" TEXT="MeanLength"/> +<node CREATED="1320937143600" ID="ID_1406603574" MODIFIED="1320937143600" TEXT="MeanWeight"/> +</node> +<node CREATED="1320688066746" ID="ID_1730944816" MODIFIED="1320688066746" TEXT="LongName"/> +<node CREATED="1320688066746" ID="ID_1166266381" MODIFIED="1320688066746" TEXT="StandardName"/> +<node CREATED="1320688066746" ID="ID_1109097484" MODIFIED="1320688066746" TEXT="Units"/> +<node CREATED="1320688066746" FOLDED="true" ID="Freemind_Link_1821167050" MODIFIED="1321263877674" TEXT="ReferenceDatumID"> + +<node CREATED="1320777097790" ID="Freemind_Link_1914434983" MODIFIED="1320777202914" TEXT="Many-to-one link to"> + +<node CREATED="1320777109523" ID="Freemind_Link_1572421551" MODIFIED="1320847127518" TEXT="ReferenceList "> + +<node CREATED="1320777242439" ID="Freemind_Link_857147024" MODIFIED="1320848340958" TEXT="ReferenceDatumID"> + +</node> +<node CREATED="1320847155862" ID="Freemind_Link_85450540" MODIFIED="1320847161221" TEXT="ReferenceType"/> +<node CREATED="1320847165659" ID="Freemind_Link_1758939672" MODIFIED="1320848117008" TEXT="ReferenceValue"> +<node CREATED="1320848357739" ID="Freemind_Link_1304249748" MODIFIED="1320848407942" TEXT=""WGS84" for positions"/> +<node CREATED="1320848368067" ID="Freemind_Link_328253837" MODIFIED="1320848412785" TEXT=""Sea surface" for depth"/> +<node CREATED="1320848387067" ID="Freemind_Link_633848349" MODIFIED="1320848419348" TEXT=""Nearest haul" for referenceStations"/> +<node CREATED="1320940877382" ID="Freemind_Link_1624269179" MODIFIED="1320940900148" TEXT=""Expert" for BiomassResults"/> +</node> +<node CREATED="1320777242439" ID="Freemind_Link_1421996870" MODIFIED="1320847341642" TEXT="ReferenceMeaning"/> +</node> +</node> +</node> +<node CREATED="1320688066746" ID="ID_539853208" MODIFIED="1320688066746" TEXT="Positive"/> +<node CREATED="1320688066746" ID="ID_1905782671" MODIFIED="1320688066746" TEXT="Calendar"/> +<node CREATED="1320688066746" ID="ID_149809453" MODIFIED="1320688066746" TEXT="Axis"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="ValidMin"/> +<node CREATED="1320688066746" ID="ID_1571780866" MODIFIED="1320688066746" TEXT="ValidMax"/> +<node CREATED="1320688066746" ID="ID_241036365" MODIFIED="1320688066746" TEXT="ScaleFactor"/> +<node CREATED="1320688066746" ID="ID_136041003" MODIFIED="1320688066746" TEXT="AddOffset"/> +<node CREATED="1320688066746" MODIFIED="1320688066746" TEXT="FillValue"/> +<node CREATED="1320688066746" ID="Freemind_Link_905151553" MODIFIED="1321263880941" TEXT="CellMethods"> +<node CREATED="1320848237366" ID="Freemind_Link_18211845" MODIFIED="1320848442144" TEXT=""CellStart""/> +<node CREATED="1320848247334" ID="Freemind_Link_1010938529" MODIFIED="1320848466113" TEXT=""CellEnd""/> +<node CREATED="1320848259725" ID="Freemind_Link_237605748" MODIFIED="1320848469066" TEXT=""Barycenter""/> +<node CREATED="1320848282365" ID="Freemind_Link_437521451" MODIFIED="1320848471956" TEXT=""Enveloppe""/> +</node> +</node> +</node> +</node> +<node CREATED="1320689419510" FOLDED="true" ID="Freemind_Link_1289051952" MODIFIED="1320776266407" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" FOLDED="true" ID="Freemind_Link_811450777" MODIFIED="1320767949934" TEXT="Many-to-one link to"> +<node CREATED="1320767953492" FOLDED="true" ID="Freemind_Link_1350464076" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_73579719" MODIFIED="1320776269548" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_1500985688" MODIFIED="1320776273781" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_139715883" MODIFIED="1320776275984" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320689419510" ID="Freemind_Link_211689814" MODIFIED="1321265369170" TEXT="DataValue"> +<node CREATED="1320777277621" ID="Freemind_Link_1407314176" MODIFIED="1320846780111" TEXT="IF Data.Name="ReferenceStation..." Many-to-one link to"> + +<node CREATED="1320777303851" ID="Freemind_Link_747569709" MODIFIED="1321265980331" TEXT="NumOpe"> + +</node> +</node> +</node> +<node CREATED="1320749054832" ID="Freemind_Link_635971056" MODIFIED="1321264941284" TEXT="CategoryID"> + +<node CREATED="1320764073732" ID="Freemind_Link_1076347325" MODIFIED="1320764106070" TEXT="Many-to-one link to"> + +<node CREATED="1320749083313" ID="Freemind_Link_1693315023" MODIFIED="1321264960238" TEXT="Category"> + +<node CREATED="1320769275292" ID="Freemind_Link_110384923" MODIFIED="1320941277773" TEXT="ClassID"> + +</node> +<node CREATED="1320769275292" ID="Freemind_Link_1983895355" MODIFIED="1320941408132" TEXT="ClassGroupID"> + +<node CREATED="1321264465700" ID="ID_337463849" MODIFIED="1321264478638" TEXT="Many-to-one"> +<node CREATED="1321264492642" ID="ID_818177982" MODIFIED="1321264498123" TEXT="ClassREf"/> +</node> +</node> +<node CREATED="1320769275292" FOLDED="true" ID="Freemind_Link_842492322" MODIFIED="1320775147602" TEXT="DepthStratumID"> + +<node CREATED="1320775451179" ID="Freemind_Link_1530080051" MODIFIED="1320775471503" TEXT="Many-to-one link to"> + +<node CREATED="1320775465582" ID="Freemind_Link_751446214" MODIFIED="1320775468348" TEXT="DepthStratumID"> + +<node CREATED="1320849580739" ID="Freemind_Link_878905761" MODIFIED="1320849635473" TEXT=""CLASD""/> +<node CREATED="1320849661957" ID="Freemind_Link_613594125" MODIFIED="1320849669988" TEXT=""CLASF""/> +<node CREATED="1320849588286" ID="Freemind_Link_961936318" MODIFIED="1320849655004" TEXT=""SURFM""/> +<node CREATED="1320849642551" ID="Freemind_Link_646097963" MODIFIED="1320849648410" TEXT=""SURFS""/> +</node> +<node CREATED="1320775465582" MODIFIED="1320775465582" TEXT="DepthStratumMeaning"/> +</node> +</node> +<node CREATED="1320769455928" ID="Freemind_Link_845722834" MODIFIED="1320941322960" TEXT="SpeciesClass"> + +<node CREATED="1320769475049" ID="Freemind_Link_1253652579" MODIFIED="1320941351429" TEXT="ClassID"> + +</node> +<node CREATED="1320769498201" ID="Freemind_Link_1043872163" MODIFIED="1320769862318" TEXT="GenusSpecies"/> +</node> +<node CREATED="1320941307742" ID="Freemind_Link_858396455" MODIFIED="1320941343539" TEXT="LengthClass"> + +<node CREATED="1320769475049" ID="Freemind_Link_192029703" MODIFIED="1320941368804" TEXT="LengthID"> + +</node> +<node CREATED="1320769498201" ID="Freemind_Link_510848700" MODIFIED="1320769862318" TEXT="GenusSpecies"/> +</node> +<node CREATED="1320941335039" ID="Freemind_Link_1792909664" MODIFIED="1320941343539" TEXT="AgeClass"> + +<node CREATED="1320769475049" ID="Freemind_Link_1741227866" MODIFIED="1320941374070" TEXT="AgeID"> + +</node> +<node CREATED="1320769498201" ID="Freemind_Link_1086724589" MODIFIED="1320769862318" TEXT="GenusSpecies"/> +</node> +<node CREATED="1321264508330" ID="ID_376164497" MODIFIED="1321264514348" TEXT="classtype"> +<node CREATED="1320941558382" ID="Freemind_Link_1556510456" MODIFIED="1320941567539" TEXT=""species""/> +<node CREATED="1320941572007" ID="Freemind_Link_1429056871" MODIFIED="1320941581539" TEXT=""group of species""/> +<node CREATED="1320941587679" ID="Freemind_Link_1845764223" MODIFIED="1320941608257" TEXT=""SpeciesAtAge""/> +<node CREATED="1320941613242" ID="Freemind_Link_1351636378" MODIFIED="1320941627226" TEXT=""SpeciesAtLength""/> +</node> +<node CREATED="1320769275292" ID="Freemind_Link_1307876459" MODIFIED="1320941630539" TEXT="ClassMeaning"> + +</node> +<node CREATED="1320769275292" ID="Freemind_Link_755221469" MODIFIED="1321264299860" TEXT="ClassValue"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320689289481" FOLDED="true" ID="Freemind_Link_289726026" MODIFIED="1321263067992" TEXT="DataQualityFlagValue"> + +<node CREATED="1320767942178" ID="Freemind_Link_783504227" MODIFIED="1320833307178" TEXT="Many-to-one link to"> + +<node CREATED="1320767953492" ID="Freemind_Link_1787831084" MODIFIED="1320768123660" TEXT="DataQuality"> + +<node CREATED="1320768161607" ID="Freemind_Link_997399526" MODIFIED="1320776294637" TEXT="DataQualityFlagValue"> + +</node> +<node CREATED="1320768161607" ID="Freemind_Link_316235656" MODIFIED="1320776297637" TEXT="DataQualityFlagMeaning"/> +<node CREATED="1320768161607" ID="Freemind_Link_1126809788" MODIFIED="1320776301386" TEXT="DataQualityFlagNote"/> +</node> +</node> +</node> +<node CREATED="1320771223791" ID="Freemind_Link_244846319" MODIFIED="1321263688839" TEXT="CellName"/> +<node CREATED="1320846260264" ID="Freemind_Link_815026680" MODIFIED="1320847432548" TEXT="ParentCellID"> + +</node> +<node CREATED="1320846244374" ID="Freemind_Link_753743013" MODIFIED="1321263081886" TEXT="CellType"> +<node CREATED="1320846931534" ID="Freemind_Link_139964329" MODIFIED="1320848477409" TEXT=""Region""/> +<node CREATED="1320846931534" ID="Freemind_Link_1317808960" MODIFIED="1320849816877" TEXT=""RegionSURF""/> +<node CREATED="1320846931534" ID="Freemind_Link_263786227" MODIFIED="1320849829626" TEXT=""RegionCLAS""/> +<node CREATED="1320846938534" ID="Freemind_Link_447324327" MODIFIED="1320848480347" TEXT=""Esdu""/> +<node CREATED="1320846944878" ID="Freemind_Link_1221538183" MODIFIED="1320848483456" TEXT=""Elementary""/> +</node> +</node> +</node> +</node> +<node CREATED="1320687449739" ID="Freemind_Link_945928166" MODIFIED="1320687449739" TEXT="ProcessingTemplate"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="ProcessingDescription"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="SounderConstant"/> +<node CREATED="1320687449739" MODIFIED="1320687449739" TEXT="DigitThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="EIThreshold"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransceiverProcessingGain"/> +<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" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAthwartship"/> +<node CREATED="1320687449754" MODIFIED="1320687449754" TEXT="TransducerProcessingBeamAngleAlongship"/> +<node CREATED="1320687449754" ID="Freemind_Link_245146210" MODIFIED="1320687449754" TEXT="AcousticDensityUnit"/> +<node CREATED="1320686503938" ID="Freemind_Link_153543466" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_1032873765" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320687449754" ID="Freemind_Link_354741307" MODIFIED="1320687449754" TEXT="Notes"/> +</node> +</node> +</node> +<node CREATED="1320686812487" ID="Freemind_Link_1001224269" MODIFIED="1320686812487" TEXT="AcquisitionSoftwareVersion"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataFormat"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="LoggedDataDatatype"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPulseLength"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionGain"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorption"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionAbsorptionDescription"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAthwartship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionBeamAngleAlongship"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransducerAcquisitionPsi"/> +<node CREATED="1320686812487" MODIFIED="1320686812487" TEXT="TransceiverAcquisitionPower"/> +<node CREATED="1320686812502" ID="Freemind_Link_274873458" MODIFIED="1320686812502" TEXT="TransceiverAcquisitionSacorrection"/> +<node CREATED="1320686503938" MODIFIED="1320686503938" TEXT="EchosounderSoundSpeed"/> +<node CREATED="1320686503938" ID="Freemind_Link_141672915" MODIFIED="1320686503938" TEXT="SoundSpeedCalculations"/> +<node CREATED="1320686503938" ID="Freemind_Link_624713978" MODIFIED="1320686503938" TEXT="PingDutyCycle"/> +</node> +</node> +</node> +</node> +<node CREATED="1320673360076" ID="Freemind_Link_1126773259" MODIFIED="1320685948826" TEXT="FishingInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_807070830" MODIFIED="1320941953210" TEXT="Station"/> +</node> +<node CREATED="1320673671949" ID="Freemind_Link_1057008121" MODIFIED="1320685995351" TEXT="EnvironmentalInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1584545104" MODIFIED="1320941958695" TEXT="Station "/> +</node> +<node CREATED="1320678176920" ID="Freemind_Link_341229272" MODIFIED="1320685999756" TEXT="LogInstrument"> + +<node CREATED="1320941913757" ID="Freemind_Link_1992319338" MODIFIED="1320941936710" TEXT="Measure"/> +</node> +</node> +</node> +<node CREATED="1320685767018" ID="Freemind_Link_1647010708" MODIFIED="1320685767018" TEXT="Title"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Abstract"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="History"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Comment"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Metadata"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Citation"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="Licence"/> +<node CREATED="1320685767018" ID="Freemind_Link_876006089" MODIFIED="1320685767018" TEXT="DateCreated"/> +<node CREATED="1320685767018" ID="ID_1802673588" MODIFIED="1320685767018" TEXT="GeospatialLonMin"/> +<node CREATED="1320685767018" ID="ID_1677614152" MODIFIED="1320685767018" TEXT="GeospatialLonMax"/> +<node CREATED="1320685767018" ID="ID_1518387517" MODIFIED="1320685767018" TEXT="GeospatialLatMin"/> +<node CREATED="1320685767018" ID="ID_207099221" MODIFIED="1320685767018" TEXT="GeospatialLatMax"/> +<node CREATED="1320685767018" ID="ID_862338299" MODIFIED="1320685767018" TEXT="Datum"/> +<node CREATED="1320685767018" ID="ID_1343683978" MODIFIED="1320685767018" TEXT="Linestring"/> +<node CREATED="1320685767018" ID="ID_957942235" MODIFIED="1320685767018" TEXT="GeospatialVerticalMin"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalMax"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="GeospatialVerticalPositive"/> +<node CREATED="1320685767018" MODIFIED="1320685767018" TEXT="TimeCoverageStart"/> +<node CREATED="1320685767018" ID="Freemind_Link_1901684066" MODIFIED="1320685767018" TEXT="TimeCoverageEnd"/> +<node CREATED="1320680978387" ID="Freemind_Link_1637211249" MODIFIED="1320680978387" TEXT="BinUnitsPingAxis"/> +<node CREATED="1320680978387" MODIFIED="1320680978387" TEXT="BinSizePingAxis"/> +<node CREATED="1320680978387" ID="Freemind_Link_1519855559" MODIFIED="1320680978387" TEXT="BinSizeRangeAxis"/> +</node> +</node> +</node> +<node CREATED="1320685294002" ID="Freemind_Link_139407579" MODIFIED="1321262716865" TEXT="VesselName"> + +<node CREATED="1320745855362" ID="Freemind_Link_204678916" MODIFIED="1321262717985" TEXT="Many-to-one link"> + +<node CREATED="1320745881986" ID="Freemind_Link_1393360106" MODIFIED="1321262719145" TEXT="VesselList"> + +<node CREATED="1320685294002" ID="Freemind_Link_1813667568" MODIFIED="1320764810167" TEXT="VesselName"> + +</node> +<node CREATED="1320685294002" ID="Freemind_Link_793336005" MODIFIED="1320685294002" TEXT="VesselType"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselCode"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Callsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="AltCallsign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="IMO"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Operator"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselLength"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselTonnage"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselEnginePower"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="VesselNoiseDesign"/> +<node CREATED="1320685294002" MODIFIED="1320685294002" TEXT="Acknowledgement"/> +</node> +</node> +</node> +</node> +</node> +</node> +<node CREATED="1320684878145" ID="Freemind_Link_20593183" MODIFIED="1320747664439" TEXT="TransitDescription"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="RelatedActivity"/> +<node CREATED="1320684878145" ID="Freemind_Link_1114663660" MODIFIED="1320747668501" TEXT="TransitStartTime"/> +<node CREATED="1320684878145" ID="Freemind_Link_461738660" MODIFIED="1320747672907" TEXT="TransitEndTime"/> +<node CREATED="1320684878145" MODIFIED="1320684878145" TEXT="TransitStartLocality"/> +<node CREATED="1320684878145" ID="Freemind_Link_690075609" MODIFIED="1320684878145" TEXT="TransitEndLocatlity"/> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_826471017" MODIFIED="1320684811880" TEXT="VoyageName"/> +<node CREATED="1320684811880" ID="ID_1876224208" MODIFIED="1320684811880" TEXT="VoyageStartDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="VoyageEndDate"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="StartPort"/> +<node CREATED="1320684811880" MODIFIED="1320684811880" TEXT="EndPort"/> +<node CREATED="1320684811880" FOLDED="true" ID="Freemind_Link_1587001602" MODIFIED="1321267290817" TEXT="AreaOfOperationID"> + +<node CREATED="1320855036138" ID="Freemind_Link_1980873432" MODIFIED="1320855073012" TEXT="Many-to-one link to"> + +<node CREATED="1320855056341" ID="Freemind_Link_691033092" MODIFIED="1320855070684" TEXT="AreaOfOperationList"> + +<node CREATED="1320855052731" ID="Freemind_Link_1412920840" MODIFIED="1320855077809" TEXT="AreaOfOperationID"> + +</node> +<node CREATED="1320855052731" ID="Freemind_Link_1977871654" MODIFIED="1320855052731" TEXT="AreaOfOperationName"/> +</node> +</node> +</node> +<node CREATED="1320684811880" ID="Freemind_Link_328229853" MODIFIED="1320684811880" TEXT="VoyageDescription"/> +<node CREATED="1320684811880" ID="Freemind_Link_586875122" MODIFIED="1320684811880" TEXT="Datum"/> +</node> +</node> +</node> +</node> +<node CREATED="1320852659278" FOLDED="true" ID="Freemind_Link_356521950" MODIFIED="1320852912978" POSITION="right" TEXT="TSparameters"> + +<node CREATED="1320854749439" ID="Freemind_Link_1220318247" MODIFIED="1320854766595" TEXT="TSparametersID"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1396585474" MODIFIED="1320854754798" TEXT="GenusSpecies"> + +</node> +<node CREATED="1320854749439" ID="Freemind_Link_1791423910" MODIFIED="1320854756845" TEXT="AcousticInstrumentID"> + +</node> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="m"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="b"/> +<node CREATED="1320854749439" MODIFIED="1320854749439" TEXT="mz"/> +<node CREATED="1320854749439" ID="Freemind_Link_1917662738" MODIFIED="1320854749439" TEXT="Reference"/> +</node> +</node> +</map> Property changes on: trunk/src/doc/EchoBAse_structure_V3.mm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r78 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions java/fr/ifremer/echobase/ui/actions/user resources resources/fr/ifremer/echobase/ui/actions resources/fr/ifremer/echobase/ui/actions/export resources/fr/ifremer/echobase/ui/actions/user resources/i18n
by sletellier＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: sletellier Date: 2011-11-14 14:53:50 +0100 (Mon, 14 Nov 2011) New Revision: 78 Url: http://forge.codelutin.com/repositories/revision/echobase/78 Log: - Add some validation files - Remove struts properties Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml trunk/echobase-ui/src/main/resources/log4j.properties Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/LoginAction-login-validation.xml trunk/echobase-ui/src/main/resources/struts.properties 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/user/ManageUser.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml 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 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/ImportAction.java 2011-11-14 13:53:50 UTC (rev 78) @@ -86,11 +86,11 @@ return SUCCESS; } - @Override - public void validate() { - //FIXME : do a real validation with a xml validation file. - if (!importModel.validate()) { - addActionError(_("echobase.error.importArgument")); - } - } +// @Override +// public void validate() { +// //FIXME : do a real validation with a xml validation file. +// if (!importModel.validate()) { +// addActionError(_("echobase.error.importArgument")); +// } +// } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java 2011-11-14 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ManageUser.java 2011-11-14 13:53:50 UTC (rev 78) @@ -48,7 +48,7 @@ public static final String BACK_TO_LIST = "backToList"; - protected transient UserService service; + protected transient UserService userService; protected EchoBaseUserDTO user; @@ -63,10 +63,10 @@ } protected UserService getUserService() { - if (service == null) { - service = newService(UserService.class); + if (userService == null) { + userService = newService(UserService.class); } - return service; + return userService; } @Override Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/ImportAction-importForm-validation.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -0,0 +1,45 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="importModel.selectedVoyage"> + + <field-validator type="fieldexpression"> + <param name="expression">importModel.accessImport == null</param> + <message key="echobase.validation.import.selectedVoyageOrAccessImport.required"/> + </field-validator> + </field> + + <field name="importModel.accessImport"> + + <field-validator type="fieldexpression"> + <param name="expression">importModel.selectedVoyage == null</param> + <message key="echobase.validation.import.selectedVoyageOrAccessImport.required"/> + </field-validator> + </field> + +</validators> Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/LoginAction-login-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/LoginAction-login-validation.xml 2011-11-14 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/LoginAction-login-validation.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -1,36 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="email"> - - <field-validator type="login"> - <message/> - </field-validator> - </field> - -</validators> Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/export/ManageExportQuery-doSaveQuery-validation.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -0,0 +1,56 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="query.name"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.name.requiredstring"/> + </field-validator> + </field> + + <field name="query.description"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.description.requiredstring"/> + </field-validator> + </field> + + <field name="query.sqlQuery"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.export.sqlQuery.requiredstring"/> + </field-validator> + <field-validator type="regex"> +  + <param name="expression">^\s*select\s+.+\s+from\s+.+$</param> + <param name="caseSensitive">false</param> + <message key="echobase.validation.export.sqlQuery.wrongformat"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml (from rev 76, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/LoginAction-login-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -0,0 +1,36 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="email"> + + <field-validator type="login"> + <message key="echobase.validation.login.wrongLogin"/> + </field-validator> + </field> + +</validators> Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/LoginAction-login-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/user/ManageUser-validation.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -0,0 +1,43 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.email"> + + <field-validator type="login"> + <message key="echobase.validation.login.wrongLogin"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="echobase.validation.login.password.requiredstring"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-14 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-14 13:53:50 UTC (rev 78) @@ -31,8 +31,8 @@ echobase.common.sqlQueries=Requêtes enregistrées echobase.common.tableName=Nom de la table echobase.common.user=Utilisateur -echobase.common.voyage=Campagne -echobase.common.voyagesToSelect=Campagnes à exporter +echobase.common.voyage=Voyage +echobase.common.voyagesToSelect=Voyage à exporter echobase.embeddedApplication.configuration=Configuration de l'application embarquée echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used= @@ -89,4 +89,4 @@ echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs echobase.user.gridTitle=Liste des utilisateurs -echobase.voyage.selectHeader=Selectionnez une campagne +echobase.voyage.selectHeader=Selectionnez un voyage Added: trunk/echobase-ui/src/main/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/resources/log4j.properties (rev 0) +++ trunk/echobase-ui/src/main/resources/log4j.properties 2011-11-14 13:53:50 UTC (rev 78) @@ -0,0 +1,38 @@ +### +# #%L +# EchoBase :: UI +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 Ifremer, Codelutin +# %% +# 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% +### +# Default to info level output; this is very handy if you eventually use Hibernate as well. +log4j.rootCategory=info, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n + +# Toute l'application +log4j.logger.fr.ifremer.echobase=INFO + +log4j.logger.com.opensymphony.xwork2.validator.ValidationInterceptor=DEBUG +log4j.logger.org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor=DEBUG \ No newline at end of file Deleted: trunk/echobase-ui/src/main/resources/struts.properties =================================================================== --- trunk/echobase-ui/src/main/resources/struts.properties 2011-11-14 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/resources/struts.properties 2011-11-14 13:53:50 UTC (rev 78) @@ -1,36 +0,0 @@ -### -# #%L -# EchoBase :: UI -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 Ifremer, Codelutin -# %% -# 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% -### -struts.ognl.allowStaticMethodAccess=true - -# Help debugging -struts.devMode=true -struts.ognl.logMissingProperties=true -struts.el.throwExceptionOnFailure=true -struts.i18n.reload=true -struts.custom.i18n.resources=resources -struts.configuration.xml.reload=true - -# Performance tuning -# see http://struts.apache.org/2.2.3/docs/performance-tuning.html -struts.freemarker.templatesCache=true \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:41:05 UTC (rev 77) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 13:53:50 UTC (rev 78) @@ -42,6 +42,9 @@ <constant name="struts.configuration.xml.reload" value="false"/> <constant name="struts.ui.theme" value="css_xhtml"/> <constant name="struts.multipart.maxSize" value="209715200"/> + +  +  <constant name="struts.freemarker.templatesCache" value="true"/> <package name="default" extends="json-default" abstract="true"

1 0

r77 - in trunk/echobase-ui/src/main: resources resources/template/css_xhtml webapp/WEB-INF/jsp/import
by sletellier＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: sletellier Date: 2011-11-14 10:41:05 +0100 (Mon, 14 Nov 2011) New Revision: 77 Url: http://forge.codelutin.com/repositories/revision/echobase/77 Log: - Allow static method access for strtus ongl - Update files headers Added: trunk/echobase-ui/src/main/resources/struts.properties Modified: trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp Added: trunk/echobase-ui/src/main/resources/struts.properties =================================================================== --- trunk/echobase-ui/src/main/resources/struts.properties (rev 0) +++ trunk/echobase-ui/src/main/resources/struts.properties 2011-11-14 09:41:05 UTC (rev 77) @@ -0,0 +1,36 @@ +### +# #%L +# EchoBase :: UI +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 Ifremer, Codelutin +# %% +# 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% +### +struts.ognl.allowStaticMethodAccess=true + +# Help debugging +struts.devMode=true +struts.ognl.logMissingProperties=true +struts.el.throwExceptionOnFailure=true +struts.i18n.reload=true +struts.custom.i18n.resources=resources +struts.configuration.xml.reload=true + +# Performance tuning +# see http://struts.apache.org/2.2.3/docs/performance-tuning.html +struts.freemarker.templatesCache=true \ No newline at end of file Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:41:05 UTC (rev 77) @@ -109,7 +109,7 @@ </package> <package name="applicationDefault" extends="default" namespace="/"> - <default-action-ref name="home" /> + <default-action-ref name="home"/>  <action name="home" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:41:05 UTC (rev 77) @@ -1,4 +1,27 @@ <#-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + 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% +--> +<#-- NOTE: The 'header' stuff that follows is in this one file for checkbox due to the fact that for checkboxes we do not want the label field to show up as checkboxes handle their own lables Modified: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:41:05 UTC (rev 77) @@ -1,4 +1,27 @@ <#-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + 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% +--> +<#-- Only show message if errors are available. This will be done if ActionSupport is used. --> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 09:27:09 UTC (rev 76) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/import.jsp 2011-11-14 09:41:05 UTC (rev 77) @@ -51,7 +51,7 @@ <s:file name="importModel.typeEchoSpeciesImport" key="echobase.importFile.typeEchoSpecies"/> - <s:textarea name="importModel.comment" key="echobase.common.comment"/> + <s:textarea name="importModel.comment" rows="4" cols="50" key="echobase.common.comment"/> </fieldset>

1 0

r76 - trunk/echobase-ui/src/main/resources
by sletellier＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: sletellier Date: 2011-11-14 10:27:09 +0100 (Mon, 14 Nov 2011) New Revision: 76 Url: http://forge.codelutin.com/repositories/revision/echobase/76 Log: Set default action as home Modified: trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:15:15 UTC (rev 75) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-14 09:27:09 UTC (rev 76) @@ -109,6 +109,8 @@ </package> <package name="applicationDefault" extends="default" namespace="/"> + <default-action-ref name="home" /> +  <action name="home" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport">

1 0

r75 - in trunk/echobase-ui/src/main: resources resources/template resources/template/css_xhtml webapp/WEB-INF/jsp/user
by sletellier＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: sletellier Date: 2011-11-14 10:15:15 +0100 (Mon, 14 Nov 2011) New Revision: 75 Url: http://forge.codelutin.com/repositories/revision/echobase/75 Log: - Fix struts theme, overide some ftl - Fix login and user edition form Added: trunk/echobase-ui/src/main/resources/template/ trunk/echobase-ui/src/main/resources/template/css_xhtml/ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/checkbox.ftl 2011-11-14 09:15:15 UTC (rev 75) @@ -0,0 +1,86 @@ +<#-- +NOTE: The 'header' stuff that follows is in this one file for checkbox due to the fact +that for checkboxes we do not want the label field to show up as checkboxes handle their own +lables +--> +<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> +<#if parameters.labelposition?default("left") == 'left'> + +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="label"<#rt/> +</#if> +>${parameters.label?html} +<#if parameters.tooltip??> + <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> +</#if> +</label><#rt/> + +</#if> + +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> + +</#if> +<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"> + +<#if parameters.required?default(false)> + *<#t/> +</#if> + +<#include "/${parameters.templateDir}/simple/checkbox.ftl" /> +<#if parameters.labelposition?default("left") != 'left'> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> + <#rt/> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> + +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="checkboxLabel"<#rt/> +</#if> +>${parameters.label?html}</label><#rt/> +</#if> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> + <#rt/> +</#if> +</#if> +</div> Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/controlheader-core.ftl 2011-11-14 09:15:15 UTC (rev 75) @@ -0,0 +1,51 @@ +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> + +<#if parameters.label??> +<#if parameters.labelposition?default("top") == 'top'> +<div <#rt/> +<#else> + +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <label <#t/> +<#if parameters.id??> + for="${parameters.id?html}" <#t/> +</#if> +<#if hasFieldErrors> + class="errorLabel"<#t/> +<#else> + class="label"<#t/> +</#if> + ><#t/> + + ${parameters.label?html} ${parameters.labelseparator!":"?html} +<#if parameters.required?default(false)> + *<#t/> +</#if> +<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> + </label><#t/> +<#if parameters.labelposition?default("top") == 'top'> +</div> <#rt/> +<#else> + <#rt/> +</#if> +</#if> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-14 08:22:12 UTC (rev 74) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-14 09:15:15 UTC (rev 75) @@ -55,9 +55,15 @@ <h2><s:text name="echobase.title.login"/></h2> <s:form method="POST" namespace="/user"> - <s:hidden key="redirectAction" label=""/> - <s:textfield name="email" key="echobase.common.email" required="true"/> - <s:password name="password" key="echobase.common.password" required="true"/> + <fieldset> + <legend> + <s:text name="echobase.title.login"/> + </legend> + <s:hidden key="redirectAction" label=""/> + <s:textfield name="email" key="echobase.common.email" required="true"/> + <s:password name="password" key="echobase.common.password" required="true"/> + </fieldset> + <s:submit action="login" key="echobase.action.login" align="right"/> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2011-11-14 08:22:12 UTC (rev 74) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userForm.jsp 2011-11-14 09:15:15 UTC (rev 75) @@ -93,7 +93,6 @@ size="40"/> <s:checkbox value="%{user.admin}" key="echobase.common.admin"/> </fieldset> - <s:text name="echobase.label.info.changePassword"/> <ul class="toolbar floatRight"> <li><s:submit action="userForm" method="doCreateOrUpdate" key="echobase.action.save" theme="simple"/></li>

1 0

r74 - in trunk: . echobase-entities echobase-services echobase-ui
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:22:12 +0100 (Mon, 14 Nov 2011) New Revision: 74 Url: http://forge.codelutin.com/repositories/revision/echobase/74 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2011-11-14 08:22:11 UTC (rev 73) +++ trunk/echobase-entities/pom.xml 2011-11-14 08:22:12 UTC (rev 74) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2011-11-14 08:22:11 UTC (rev 73) +++ trunk/echobase-services/pom.xml 2011-11-14 08:22:12 UTC (rev 74) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2011-11-14 08:22:11 UTC (rev 73) +++ trunk/echobase-ui/pom.xml 2011-11-14 08:22:12 UTC (rev 74) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 08:22:11 UTC (rev 73) +++ trunk/pom.xml 2011-11-14 08:22:12 UTC (rev 74) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.1</version> + <version>0.2-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,11 +79,11 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.1 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r73 - tags
by maven-release＠users.forge.codelutin.com Nov. 14, 2011

Nov. 14, 2011

Author: maven-release Date: 2011-11-14 09:22:11 +0100 (Mon, 14 Nov 2011) New Revision: 73 Url: http://forge.codelutin.com/repositories/revision/echobase/73 Log: [maven-release-plugin] copy for tag echobase-0.1 Added: tags/echobase-0.1/

1 0