- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r453 - in trunk/src/site: resources/user rst/coordinator rst/user
by jcouteau＠users.labs.libre-entreprise.org April 19, 2010

April 19, 2010

Author: jcouteau Date: 2010-04-19 13:14:53 +0000 (Mon, 19 Apr 2010) New Revision: 453 Log: Modify doc about modifications/comments on sampling plan Modified: trunk/src/site/resources/user/sampling_plan.png trunk/src/site/rst/coordinator/echantillonage.rst trunk/src/site/rst/user/echantillonage.rst Modified: trunk/src/site/resources/user/sampling_plan.png =================================================================== (Binary files differ) Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 12:14:03 UTC (rev 452) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 13:14:53 UTC (rev 453) @@ -45,7 +45,8 @@ :width: 800px Il est aussi possible d'envoyer un message aux administrateur à propos d'une -ligne du plan. Ce message est intégré à l'historique de le ligne du plan. +ligne du plan en cliquant sur l'icone 'horloge' à droite du plan. Ce message est +intégré à l'historique de la ligne du plan. .. image::comment_sampling_plan.png :width: 800px Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-04-19 12:14:03 UTC (rev 452) +++ trunk/src/site/rst/user/echantillonage.rst 2010-04-19 13:14:53 UTC (rev 453) @@ -45,6 +45,10 @@ susceptibles d'accueillir un observateur en cliquant sur l'icone 'bateau' à droite du plan, pour la ligne concernée. +Il est aussi possible de voir l'historique des modifications/commentaires +concernant une ligne du pplan en cliquant sur l'icone 'horloge' à droite du +plan, pour la ligne concernée. + .. image::sampling_plan.png :width: 800px

1 0

[Suiviobsmer-commits] r452 - in trunk/wao-business/src: main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao test/java/fr/ifremer/wao/service test/resources test/resources/import
by fdesbois＠users.labs.libre-entreprise.org April 19, 2010

April 19, 2010

Author: fdesbois Date: 2010-04-19 12:14:03 +0000 (Mon, 19 Apr 2010) New Revision: 452 Log: Add new tests for ServiceContact Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/resources/import/contacts.csv trunk/wao-business/src/test/resources/log4j.properties Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-16 15:00:30 UTC (rev 451) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 12:14:03 UTC (rev 452) @@ -56,6 +56,7 @@ import fr.ifremer.wao.entity.*; import fr.ifremer.wao.io.*; import fr.ifremer.wao.io.WaoCsvHeader.*; +import org.apache.commons.lang.StringUtils; import org.nuiton.util.PeriodDates; import org.nuiton.util.beans.BinderBuilder; import org.nuiton.util.beans.BinderProvider; @@ -214,18 +215,28 @@ // Create the contact if not defined if (destination == null) { + if (log.isDebugEnabled()) { + log.debug("Create a new contact on " + + source.getTopiaCreateDate()); + } destination = dao.create( Contact.BOAT, source.getBoat(), Contact.SAMPLE_ROW, source.getSampleRow(), // FIXME-FD20100415 : don't use the topiaCreateDate as a business field TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate()); + + if (log.isDebugEnabled()) { + log.debug("TopiaId of the new contact : " + + destination.getTopiaId()); + } + // Set the new topiaId in source contact source.setTopiaId(destination.getTopiaId()); } // Bind the contact in argument with the contact in session - BinderProvider.getBinder(Contact.class). - copy(source, destination); + BinderProvider.getBinder(Contact.class).copy(source, destination); + // Update the change dao.update(destination); } @@ -441,15 +452,16 @@ } // Create elligibleBoat if needed before saving the contact - updateElligibleBoatForContact(transaction, contact); + updateElligibleBoatForContact(transaction, contactCsv); try { // Execute createOrUpdateContact // Will calculate data for SampleMonth and maybe // throw a NullSampleMonthException if there is // an error during the calcul of sampleMonthTidesValue - createOrUpdateContact(dao, contact, contact, + createOrUpdateContact(dao, contactCsv, contact, updateValidation); + } catch (NullSampleMonthException eee) { // The row will be refused in this case throw new ImportRefusedException("Impossible de " + Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-16 15:00:30 UTC (rev 451) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-19 12:14:03 UTC (rev 452) @@ -75,7 +75,7 @@ public void start() throws WaoException { if (log.isDebugEnabled()) { - log.debug("TEST START"); + log.debug("## TEST START"); } try { context = new WaoContextImpl(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-16 15:00:30 UTC (rev 451) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-19 12:14:03 UTC (rev 452) @@ -6,12 +6,14 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ImportResults; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactDAO; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleMonthDAO; import fr.ifremer.wao.entity.SampleRow; @@ -25,8 +27,10 @@ import fr.ifremer.wao.io.WaoCsvHeader.SAMPLING; import fr.ifremer.wao.service.ServiceContactImpl.NullSampleMonthException; import java.io.IOException; +import java.io.InputStream; import java.text.ParseException; import java.util.Date; +import java.util.List; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -196,7 +200,8 @@ } @Test - public void testUpdateSampleMonthTidesValue() throws TopiaException, NullSampleMonthException { + public void testUpdateSampleMonthTidesValue() throws TopiaException, + NullSampleMonthException { logger.info("testUpdateSampleMonthTidesValue"); /** PREPARE DATA **/ @@ -310,7 +315,7 @@ ImportRefusedException, ImportRefusedException, ParseException { - logger.info("testUpdateSampleMonthTidesValue"); + logger.info("testLoadContactCsv"); /** PREPARE DATA **/ prepareData(true, true); @@ -428,4 +433,183 @@ transaction.closeContext(); } } + + @Test + public void testCreateOrUpdateContact() + throws TopiaException, NullSampleMonthException { + logger.info("testCreateOrUpdateContact"); + + /** PREPARE DATA **/ + prepareData(true, true); + + // Don't use a mock in this case + Contact newContact = service.getNewContact(observer, sampleRow, boat); + newContact.setTopiaCreateDate(DateUtils.createDate(2, 3, 2010)); + + /** EXEC METHOD **/ + + logger.info("test 1 : Create new contact with state CONTACT_START"); + TopiaContext transaction = null; + String newTopiaId = null; + try { + transaction = manager.getContext().beginTransaction(); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + service.createOrUpdateContact(dao, newContact, null, false); + transaction.commitTransaction(); + + newTopiaId = newContact.getTopiaId(); + assertNotNull(newTopiaId); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + + logger.info("test 1 : Check contact existence"); + try { + transaction = manager.getContext().beginTransaction(); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + Contact existingContact = dao.findByTopiaId(newTopiaId); + assertNotNull(existingContact); + assertEquals(boat, existingContact.getBoat()); + assertEquals(sampleRow, existingContact.getSampleRow()); + assertEquals(observer, existingContact.getObserver()); + assertEquals(ContactState.CONTACT_START, + existingContact.getContactState()); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + + logger.info("test 2 : Update the contact with state BOARDING_DONE, " + + "tideBeginDate, tideEndDate and NbObservants"); + Date tideBeginDate = DateUtils.createDate(18,3,2010); + Date tideEndDate = DateUtils.createDate(19,3,2010); + try { + transaction = manager.getContext().beginTransaction(); + + newContact.setContactState(ContactState.BOARDING_DONE); + newContact.setTideBeginDate(tideBeginDate); + newContact.setTideEndDate(tideEndDate); + newContact.setNbObservants(1); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + Contact oldContact = dao.findByTopiaId(newTopiaId); + + service.createOrUpdateContact(dao, newContact, oldContact, false); + transaction.commitTransaction(); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + + logger.info("test 2 : Check update contact"); + try { + transaction = manager.getContext().beginTransaction(); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + Contact existingContact = dao.findByTopiaId(newTopiaId); + assertNotNull(existingContact); + assertEquals(1, existingContact.getNbObservants()); + assertEquals(tideBeginDate, existingContact.getTideBeginDate()); + assertEquals(tideEndDate, existingContact.getTideEndDate()); + assertEquals(ContactState.BOARDING_DONE, + existingContact.getContactState()); + + // Will have an update on sampleMonth 03/2010 for estimatedTides + SampleMonthDAO monthDAO = + WaoDAOHelper.getSampleMonthDAO(transaction); + SampleMonth existingMonth = + monthDAO.findByTopiaId(sampleMonth.getTopiaId()); + assertNotNull(existingMonth); + assertEquals(1, existingMonth.getEstimatedTidesValue()); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + } + + @Test + public void testImportContactCsv() + throws TopiaException, WaoBusinessException, IOException { + logger.info("testImportContactCsv"); + + /** PREPARE DATA **/ + prepareData(true, true); + + when(creator.getCompany()).thenReturn(company); + when(creator.isAdmin()).thenReturn(false); + when(creator.getLogin()).thenReturn(observer.getLogin()); + + /** EXEC METHOD **/ + logger.info("test 1 : Import new contact with observer creator"); + InputStream input = + getClass().getResourceAsStream("/import/contacts.csv"); + try { + ImportResults results = service.importContactCsv(creator, input); + assertEquals(1, results.getNbRowsImported()); + assertEquals(0, results.getNbRowsRefused()); + assertTrue(results.getErrors().isEmpty()); + } finally { + input.close(); + } + + logger.info("test 1 : Check creation of the contact"); + TopiaContext transaction = null; + try { + transaction = manager.getContext().beginTransaction(); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + List<Contact> contactsFound = dao.findAll(); + assertEquals(1, contactsFound.size()); + Contact contactFound = contactsFound.get(0); + assertNull(contactFound.getValidationCompany()); + assertNull(contactFound.getValidationProgram()); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + + logger.info("test 2 : Import new contact with super admin creator"); + when(creator.getCompany()).thenReturn(company); + when(creator.isAdmin()).thenReturn(true); + when(creator.getLogin()).thenReturn("admin"); + + input = getClass().getResourceAsStream("/import/contacts.csv"); + try { + ImportResults results = service.importContactCsv(creator, input); + assertEquals(1, results.getNbRowsImported()); + assertEquals(0, results.getNbRowsRefused()); + assertTrue(results.getErrors().isEmpty()); + } finally { + input.close(); + } + + logger.info("test 2 : Check update validations of the contact"); + try { + transaction = manager.getContext().beginTransaction(); + + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); + + List<Contact> contactsFound = dao.findAll(); + assertEquals(1, contactsFound.size()); + Contact contactFound = contactsFound.get(0); + assertTrue(contactFound.getValidationCompany()); + assertTrue(contactFound.getValidationProgram()); + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } + } } Modified: trunk/wao-business/src/test/resources/import/contacts.csv =================================================================== --- trunk/wao-business/src/test/resources/import/contacts.csv 2010-04-16 15:00:30 UTC (rev 451) +++ trunk/wao-business/src/test/resources/import/contacts.csv 2010-04-19 12:14:03 UTC (rev 452) @@ -1,2 +1,2 @@ "CONT_CREATION","OBSERV_ID","PLAN_CODE","NAVS_COD","CONT_ETAT","CONT_DEBUT_MAREE","CONT_FIN_MAREE","CONT_NB_OBSERV","CONT_MAM_CAPT","CONT_MAM_OBS","CONT_COMMENT","CONT_ALLEGRO","CONT_SOCIETE_VALID","CONT_PROGRAM_VALID" -17/07/2009,"jmichmuche","2010_01",177474,"Embarquement réalisé ",22/07/2010,22/07/2010,1,,,,22/07/2010,"A","A" \ No newline at end of file +17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ",18/03/2010,19/03/2010,1,,,,22/07/2010,"A","A" Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-04-16 15:00:30 UTC (rev 451) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-04-19 12:14:03 UTC (rev 452) @@ -8,6 +8,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n -log4j.logger.fr.ifremer.wao=DEBUG +log4j.logger.fr.ifremer.wao=INFO log4j.logger.org.nuiton.util=INFO log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR

1 0

[Suiviobsmer-commits] r451 - trunk/wao-business
by fdesbois＠users.labs.libre-entreprise.org April 16, 2010

April 16, 2010

Author: fdesbois Date: 2010-04-16 15:00:30 +0000 (Fri, 16 Apr 2010) New Revision: 451 Log: ignore netbeans actions file Removed: trunk/wao-business/nbactions.xml Modified: trunk/wao-business/ Property changes on: trunk/wao-business ___________________________________________________________________ Modified: svn:ignore - target *.iml *.ipr *.iws + target *.iml *.ipr *.iws nbactions.xml Deleted: trunk/wao-business/nbactions.xml =================================================================== --- trunk/wao-business/nbactions.xml 2010-04-16 14:42:50 UTC (rev 450) +++ trunk/wao-business/nbactions.xml 2010-04-16 15:00:30 UTC (rev 451) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<actions> - <action> - <actionName>CUSTOM-offline</actionName> - <displayName>offline</displayName> - <goals> - <goal>clean</goal> - <goal>install</goal> - <goal>-o</goal> - </goals> - </action> - </actions>

1 0

[Suiviobsmer-commits] r450 - in trunk: wao-business wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/io w
by fdesbois＠users.labs.libre-entreprise.org April 16, 2010

April 16, 2010

Author: fdesbois Date: 2010-04-16 14:42:50 +0000 (Fri, 16 Apr 2010) New Revision: 450 Log: - Evo #2100 : calculate estimated tides for sampleMonth when contact is saved (new field in model -> need a migration) - Decompose importContactCsv method in three methods : loadContactCsv, updateElligibleBoatForContact, createOrUpdateContact (which calls the update for tides in sampleMonth) - Improve contact import using a bean ContactInput + ImportRefusedException - Add EntityProperty classes to easily manage properties in HQL (TopiaQuery) - Add tests for serviceContact using Mockito - Repair other tests broken by new update sampleMonth in contact save - NOTE : import/export are very heterogeneous, may be a refactor is needed to clean that Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/resources/import/ trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/pom.xml 2010-04-16 14:42:50 UTC (rev 450) @@ -76,6 +76,10 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> </dependencies>  Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-16 14:42:50 UTC (rev 450) @@ -72,7 +72,7 @@ } @Override - protected void createBoatInfosNewColumns_1_2(List<String> queries) { + protected void createBoatInfosNewColumns_1_2a(List<String> queries) { // Evo #2060 : add new columns in BoatInfos (contactSiret, // contactAddress1, contactAddress2, contactCity, contactPostalCode) queries.add("ALTER TABLE BoatInfos ADD contactAddress1 TEXT;"); @@ -82,4 +82,11 @@ queries.add("ALTER TABLE BoatInfos ADD contactSiret TEXT;"); } + @Override + protected void createSampleMonthEstimatedTidesColumn_1_2b(List<String> queries) { + queries.add("ALTER TABLE SampleMonth ADD estimatedTidesValue INTEGER;"); + // TODO : calculate estimatedTidesValue for all existing contacts + // estimatedTidesValue = nbContacts with state BOARDING_DONE + } + } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-16 14:42:50 UTC (rev 450) @@ -56,9 +56,12 @@ protected abstract void changeSampleRowLogAdminColumn_1_1c( List<String> queries); - protected abstract void createBoatInfosNewColumns_1_2( + protected abstract void createBoatInfosNewColumns_1_2a( List<String> queries); + protected abstract void createSampleMonthEstimatedTidesColumn_1_2b( + List<String> queries); + @Override public boolean askUser(Version dbVersion, Version applicationVersion, @@ -103,8 +106,10 @@ List<String> queries = new ArrayList<String>(); - createBoatInfosNewColumns_1_2(queries); + createBoatInfosNewColumns_1_2a(queries); + createSampleMonthEstimatedTidesColumn_1_2b(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,56 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao.entity; + +/** + * ContactProperty + * + * Created: 14 avr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public class ContactProperty extends EntityProperty { + + public ContactProperty(String mainAlias) { + super(); + setMainAlias(mainAlias); + } + + public String nameSampleRow() { + return nameProperty(Contact.SAMPLE_ROW); + } + + public String nameState() { + return nameProperty(Contact.STATE); + } + + public String nameTideBeginDate() { + return nameProperty(Contact.TIDE_BEGIN_DATE); + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,67 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao.entity; + +import org.nuiton.topia.framework.TopiaQuery; + +/** + * EntityProperty + * + * Created: 14 avr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public abstract class EntityProperty { + + protected String mainAlias; + + public EntityProperty() { + } + + public void setMainAlias(String mainAlias) { + this.mainAlias = mainAlias; + } + + public String getMainAlias() { + return mainAlias; + } + + public String name() { + return getMainAlias(); + } + + protected String nameProperty(String propertyName) { + return TopiaQuery.getProperty(mainAlias, propertyName); + } + + @Override + public String toString() { + return name(); + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,64 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao.entity; + +/** + * FishingZoneProperty + * + * Created: 14 avr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class FishingZoneProperty extends EntityProperty { + + public FishingZoneProperty(String mainAlias) { + super(); + setMainAlias(mainAlias); + } + + public String nameFacadeName() { + return nameProperty(FishingZone.FACADE_NAME); + } + + public String nameSectorName() { + return nameProperty(FishingZone.SECTOR_NAME); + } + + public String nameDistrictCode() { + return nameProperty(FishingZone.DISTRICT_CODE); + } + + public String nameSampleRow() { + return nameProperty(FishingZone.SAMPLE_ROW); + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-16 14:42:50 UTC (rev 450) @@ -61,8 +61,11 @@ * the real tides value will be set to 0. * @param nbDays to add or remove (if negative) * @throws WaoException for saving problem + * @deprecated the realTideTime will be automatically update on contact + * change */ @Override + @Deprecated public void addRealTideTime(int nbDays) throws WaoException { TopiaContext transaction = null; try { Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,52 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao.entity; + +/** + * SampleMonthProperty + * + * Created: 14 avr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public class SampleMonthProperty extends EntityProperty{ + + public SampleMonthProperty(String mainAlias) { + super(); + setMainAlias(mainAlias); + } + + public String nameSampleRow() { + return nameProperty(SampleMonth.SAMPLE_ROW); + } + + public String namePeriodDate() { + return nameProperty(SampleMonth.PERIOD_DATE); + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-16 14:42:50 UTC (rev 450) @@ -288,6 +288,7 @@ } @Override + @Deprecated public boolean addRealTideTime(Contact contact) throws WaoException { if (contact.getTideEndDate() == null || contact.getTideBeginDate() == null) { @@ -307,6 +308,7 @@ } @Override + @Deprecated public void removeRealTideTime(Contact contact) throws WaoException { if (contact.getTideEndDate() == null || contact.getTideBeginDate() == null) { Added: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,53 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao.entity; + +/** + * SampleRowProperty + * + * Created: 14 avr. 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public class SampleRowProperty extends EntityProperty { + + public SampleRowProperty(String mainAlias) { + super(); + setMainAlias(mainAlias); + } + + public String nameCode() { + return nameProperty(SampleRow.CODE); + } + + public String nameCompany() { + return nameProperty(SampleRow.COMPANY); + } + +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,190 @@ + +package fr.ifremer.wao.io; + +import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.BoatDAO; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.ContactImpl; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRowDAO; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserDAO; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * ContactInput is an extension of ContactImpl. This class add behavior on + * properties setter which takes String instead of Entity (SampleRow, Boat, + * Observer). There is also exceptions thrown if data can't be found. + * The ContactInput need to be initialized with a TopiaContext. + * ContactInput is used in contacts import. + * + * Created: 15 avr. 2010 + * + * @author fdesbois + */ +public class ContactInput extends ContactImpl { + + private static final long serialVersionUID = 1L; + + protected TopiaContext transaction; + + protected int rowNumber; + + protected WaoUser creator; + + protected Company company; + + /** + * Initialization of the ContactInput. Need a {@code transaction} to + * retrieve data entity from there key string. Need the creator to check + * the company reference to the observer (only an admin can import a contact + * for any companies). Need also the {@code rowNumber} in the import file to + * use it in {@link ImportRefusedException} thrown by methods. + * + * @param transaction to use for loading entity data + * @param creator of the contact + * @param rowNumber in the input file + */ + public void initialize(TopiaContext transaction, WaoUser creator, + int rowNumber) { + this.transaction = transaction; + this.rowNumber = rowNumber; + this.creator = creator; + } + + /** + * Creator of the contact. + * + * @return the WaoUser creator of the contact. + */ + public WaoUser getCreator() { + return creator; + } + + /** + * Set the contact {@code state} of the Contact. This will check if the + * {@code state} is corresponding to an existing {@link ContactState}. + * + * @param state to set + * @throws ImportRefusedException if state is not allowed + */ + public void setContactState(String state) throws ImportRefusedException { + ContactState contactState = ContactState.valueOfLibelle(state); + if (contactState == null) { + throw new ImportRefusedException( + "Etat du contact invalide '" + state + "', " + + "valeurs possibles : " + + ContactState.availableStates(), rowNumber, STATE); + } + setContactState(contactState); + } + + /** + * Set the observer from his {@code observerLogin}. + * + * @param observerLogin to find the observer + * @throws TopiaException + * @throws ImportRefusedException if user doesn't exist + */ + public void setObserver(String observerLogin) + throws TopiaException, ImportRefusedException { + // Find existing user with login + WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); + WaoUser user = userDAO.findByLogin(observerLogin); + if (user == null) { + throw new ImportRefusedException("Utilisateur inexistant avec " + + "l'identifiant : " + observerLogin, rowNumber, OBSERVER); + } + setObserver(user); + } + + /** + * Initialize the company for the Contact. Used to check with sampleRow + * company. This method check if the observer company is the same as + * the creator company in the case of a non admin creator. The observer + * need to be set before calling this method. + * + * @throws ImportRefusedException if observer company differs from creator + * one + */ + public void initCompany() throws ImportRefusedException { + // Keep observer company for an admin creator + if (creator.isAdmin()) { + company = observer.getCompany(); + // For a non admin creator, use his own company + } else { + company = creator.getCompany(); + + // Check if the observer company is the same as the creator one + if (!observer.getCompany().equals(company)) { + throw new ImportRefusedException( + "L'observateur avec pour login '" + + observer.getLogin() + + "' n'appartient pas à votre société !", rowNumber, + WaoUser.COMPANY); + } + } + } + + /** + * Company of the contact. + * + * @return the Company of the contact. + */ + public Company getCompany() { + return company; + } + + /** + * Set the sampleRow from its {@code sampleRowCode}. The company must be + * initalize before using this method because the sampleRow will be found + * using the company and sampleRowCode constraints to be sure to set a + * sampleRow allowed for the contact. + * + * @param sampleRowCode to find the sampleRow + * @throws TopiaException + * @throws ImportRefusedException if the sampleRow not exists or not allowed + * for the company + */ + public void setSampleRow(String sampleRowCode) + throws TopiaException, ImportRefusedException { + if (company == null) { + throw new NullPointerException("Company can't be null to save" + + " the contact with SampleRow [code = " + + sampleRowCode + "]"); + } + SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); + SampleRow rowFound = dao.findByProperties( + SampleRow.CODE, sampleRowCode, + SampleRow.COMPANY, company); + if(rowFound == null) { + throw new ImportRefusedException("Ligne d'échantillon inexistante" + + " ou incompatible avec la société pour le code : " + + sampleRowCode, rowNumber, SAMPLE_ROW); + } + setSampleRow(rowFound); + } + + /** + * Set the boat from its {@code boatImmatriculation}. + * + * @param boatImmatriculation to find the boat + * @throws TopiaException + * @throws ImportRefusedException if boat no exists + */ + public void setBoat(int boatImmatriculation) + throws TopiaException, ImportRefusedException { + BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); + Boat boatFound = dao.findByImmatriculation(boatImmatriculation); + if(boatFound == null) { + throw new ImportRefusedException("Navire inexistant avec" + + " l'immatriculation : " + boatImmatriculation, + rowNumber, BOAT); + } + setBoat(boatFound); + } + +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-16 14:42:50 UTC (rev 450) @@ -95,12 +95,11 @@ return "X".equals(mammals); } - public static Date parseContactCreateDate(String code, String createDate) throws ParseException { + public static Date parseContactCreateDate(String code, Date createDate) throws ParseException { Calendar time = new GregorianCalendar(Locale.FRENCH); if (StringUtils.isNotEmpty(code)) { - DateFormat timeFormat = CONTACT.getTimeFormat(); time = new GregorianCalendar(Locale.FRENCH); - time.setTime(timeFormat.parse(code)); + time.setTime(CONTACT.TIME_FORMAT.parse(code)); } else { // Use current date with no time as a reference if no code is set time.setTime(context.getCurrentDate()); @@ -111,9 +110,8 @@ } Calendar result = new GregorianCalendar(Locale.FRENCH); - if (StringUtils.isNotEmpty(createDate)) { - DateFormat dateFormat = CONTACT.getDateFormat(); - result.setTime(dateFormat.parse(createDate)); + if (createDate != null) { + result.setTime(createDate); result.set(Calendar.HOUR_OF_DAY, time.get(Calendar.HOUR_OF_DAY)); result.set(Calendar.MINUTE, time.get(Calendar.MINUTE)); result.set(Calendar.SECOND, time.get(Calendar.SECOND)); @@ -210,6 +208,7 @@ * @throws IOException * @throws ParseException * @see ImportHelper#read(CsvReader, IOHeader) + * @see ImportHelper#parseDate(String, String) */ public static Date readDate(CsvReader reader, DatedHeader header) throws IOException, ParseException { Added: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,42 @@ + +package fr.ifremer.wao.io; + +/** + * ImportRefusedException is used to advise import service that an error occurs + * during loading data. Generally this exception is catched and messages will + * be encapsulated in {@link fr.ifremer.wao.bean.ImportResults}. + * + * Created: 15 avr. 2010 + * + * @author fdesbois + */ +public class ImportRefusedException extends Exception { + + private static final long serialVersionUID = 1L; + + /** Number of the row in import file **/ + protected int rowNumber; + + /** Name of the field in import file **/ + protected String field; + + public ImportRefusedException(String message, int rowNumber, String field, + Throwable eee) { + super(message, eee); + this.rowNumber = rowNumber; + this.field = field; + } + + public ImportRefusedException(String message, int rowNumber, String field) { + this(message, rowNumber, field, null); + } + + public int getRowNumber() { + return rowNumber; + } + + public String getField() { + return field; + } + +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-16 14:42:50 UTC (rev 450) @@ -338,6 +338,12 @@ private int contactHeader; + public static final DateFormat DATE_FORMAT = + new SimpleDateFormat(defaultDatePattern(), Locale.FRENCH); + + public static final DateFormat TIME_FORMAT = + new SimpleDateFormat("HHmmssS", Locale.FRENCH); + CONTACT(int index) { this.contactHeader = index; } @@ -356,14 +362,6 @@ return "dd/MM/yyyy"; } - public static DateFormat getDateFormat() { - return new SimpleDateFormat(defaultDatePattern(), Locale.FRENCH); - } - - public static DateFormat getTimeFormat() { - return new SimpleDateFormat("HHmmssS", Locale.FRENCH); - } - public static int getTotalHeaders() { // CONT_PROGRAM_VALID is the last column return CONT_PROGRAM_VALID.forContactCsv() + 1; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-16 14:42:50 UTC (rev 450) @@ -42,7 +42,6 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.nuiton.topia.TopiaContext; @@ -50,7 +49,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.framework.TopiaQuery; import fr.ifremer.wao.*; -import fr.ifremer.wao.WaoBusinessException.Type; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ImportResults; @@ -58,6 +56,9 @@ import fr.ifremer.wao.entity.*; import fr.ifremer.wao.io.*; import fr.ifremer.wao.io.WaoCsvHeader.*; +import org.nuiton.util.PeriodDates; +import org.nuiton.util.beans.BinderBuilder; +import org.nuiton.util.beans.BinderProvider; /** * ServiceContactImpl @@ -73,6 +74,38 @@ private WaoContext context; + + public ServiceContactImpl() { + prepareBinderForContact(); + } + + /** + * Prepare the Binder for Contact copy. This method is called in + * service constructor. The copy from two Contact will be available + * anywhere using BinderProvider.get(Contact.class).copy(source, dest); + * + * @see org.nuiton.util.beans.Binder + * @see org.nuiton.util.beans.BinderProvider + */ + protected void prepareBinderForContact() { + BinderBuilder builder = new BinderBuilder(); + // Properties SAMPLE_ROW, BOAT, TOPIA_CREATE_DATE are immuable + builder.createBinderModel(Contact.class).addSimpleProperties( + Contact.COMMENT, + Contact.DATA_INPUT_DATE, + Contact.MAMMALS_CAPTURE, + Contact.MAMMALS_OBSERVATION, + Contact.NB_OBSERVANTS, + Contact.OBSERVER, + Contact.STATE, + Contact.TIDE_BEGIN_DATE, + Contact.TIDE_END_DATE, + Contact.TIDE_NB_DAYS, + Contact.VALIDATION_COMPANY, + Contact.VALIDATION_PROGRAM); + BinderProvider.registerBinder(builder); + } + public void setContext(WaoContext context) { this.context = context; } @@ -137,7 +170,8 @@ @Override public void executeSaveContact(TopiaContext transaction, - Contact contact, boolean delete) throws TopiaException { + Contact contact, boolean delete) + throws TopiaException, NullSampleMonthException { ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); @@ -145,16 +179,57 @@ log.debug("Create date : " + contact.getTopiaCreateDate()); } - context.prepareTopiaId(Contact.class, contact); + Contact contactFound = dao.findByTopiaId(contact.getTopiaId()); + + //context.prepareTopiaId(Contact.class, contact); if (delete) { - dao.delete(contact); + dao.delete(contactFound); } else { - dao.update(contact); + createOrUpdateContact(dao, contact, contactFound, true); } - transaction.commitTransaction(); } + /** + * Create or Update a Contact from {@code source} to {@code destination}. + * The sampleMonth referenced to this contact will be automatically updated + * for realTidesValue and estimatedTidesValue (corresponding to number of + * contacts which are corrects). The {@code calculateReal} identify that + * real tides has to be calculated or not during sampleMonth update. + * + * @param dao to use for create or update + * @param source which contains data to save + * @param destination receiver to save (will be null for a creation) + * @param calculateReal for sampleMonth update + * @throws TopiaException + * @throws NullSampleMonthException + * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) + */ + protected void createOrUpdateContact(ContactDAO dao, Contact source, + Contact destination, boolean calculateReal) + throws TopiaException, NullSampleMonthException { + + updateSampleMonthTidesValue(dao.getContext(), destination, + source, calculateReal); + + // Create the contact if not defined + if (destination == null) { + destination = dao.create( + Contact.BOAT, source.getBoat(), + Contact.SAMPLE_ROW, source.getSampleRow(), + // FIXME-FD20100415 : don't use the topiaCreateDate as a business field + TopiaEntity.TOPIA_CREATE_DATE, + source.getTopiaCreateDate()); + // Set the new topiaId in source contact + source.setTopiaId(destination.getTopiaId()); + } + // Bind the contact in argument with the contact in session + BinderProvider.getBinder(Contact.class). + copy(source, destination); + // Update the change + dao.update(destination); + } + @Override public InputStream executeExportContactCsv(TopiaContext transaction, ContactFilter filter) throws Exception { @@ -194,7 +269,7 @@ export.writeHeaders(); - DateFormat dateFormat = CONTACT.getDateFormat(); + DateFormat dateFormat = CONTACT.DATE_FORMAT; // Get contacts from database ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); @@ -210,7 +285,7 @@ List<Contact> contacts = dao.findAllByQuery(query); - DateFormat timeFormat = CONTACT.getTimeFormat(); + DateFormat timeFormat = CONTACT.TIME_FORMAT; for (Contact contact : contacts) { export.newRecord(); @@ -318,236 +393,388 @@ int currRow = 1; CsvReader reader = new CsvReader(input, context.getCsvCharset()); - reader.readHeaders(); + try { + reader.readHeaders(); - ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); - WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); + ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); - long tic; - tic = System.currentTimeMillis(); - while(reader.readRecord()) { - currRow++; + long tic; + tic = System.currentTimeMillis(); + DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); + while(reader.readRecord()) { + try { + currRow++; - String observerId = ImportHelper.read(reader, CONTACT.OBSERV_ID); - String state = ImportHelper.read(reader, CONTACT.CONT_ETAT); + boolean updateValidation = user.isAdmin() && + user.getLogin().equals("admin"); - ContactState contactState = ContactState.valueOfLibelle(state); + // Load ContactInput using CsvReader + ContactInput contactCsv = new ContactInput(); + contactCsv.initialize(transaction, user, currRow); + loadContactCsv(reader, contactCsv, updateValidation); - if (contactState == null) { - throw new WaoBusinessException(Type.IMPORT_ERROR, - this.getClass(), - "Erreur ligne " + currRow + " : " + - "Etat du contact invalide '" + state + "', " + - "valeurs possibles : " + - ContactState.availableStates()); - } + if (log.isDebugEnabled()) { + log.debug("Ligne " + currRow + " : " + + "Create date : " + + contactCsv.getTopiaCreateDate()); + } - WaoUser observer = userDAO.findByLogin(observerId); - if (observer != null) { - Company company = user.getCompany(); - // For an admin, get the company from database - if (user.isAdmin()) { - company = observer.getCompany(); - // For a user, check if the observer as the same company as the current user - } else if (!observer.getCompany().equals(company)) { - throw new WaoBusinessException(Type.IMPORT_ERROR, - this.getClass(), - "Erreur ligne " + currRow + " : " + - "L'observateur avec pour login '" + observerId + - "' n'appartient pas à votre société !"); + // Retrieve the existing contact + String companyProperty = + TopiaQuery.getProperty(Contact.OBSERVER, + WaoUser.COMPANY); + + Contact contact = dao.findByProperties( + TopiaEntity.TOPIA_CREATE_DATE, + contactCsv.getTopiaCreateDate(), + companyProperty, contactCsv.getCompany(), + Contact.BOAT, contactCsv.getBoat(), + Contact.SAMPLE_ROW, contactCsv.getSampleRow()); + + // Check validation for existing Contact + if (!updateValidation && contact != null && + contact.getValidationCompany() != null) { + throw new ImportRefusedException("Le contact est" + + " déjà validé dans l'application" + + " et ne peut pas être importé", currRow, + Contact.VALIDATION_COMPANY); + } + + // Create elligibleBoat if needed before saving the contact + updateElligibleBoatForContact(transaction, contact); + + try { + // Execute createOrUpdateContact + // Will calculate data for SampleMonth and maybe + // throw a NullSampleMonthException if there is + // an error during the calcul of sampleMonthTidesValue + createOrUpdateContact(dao, contact, contact, + updateValidation); + } catch (NullSampleMonthException eee) { + // The row will be refused in this case + throw new ImportRefusedException("Impossible de " + + "mettre à jour le nombre de marée réels, " + + "vérifiez le mois de " + + dateFormat.format(contact.getTideBeginDate()) + + " pour la ligne du plan " + + contactCsv.getSampleRow().getCode(), currRow, + Contact.TIDE_BEGIN_DATE, eee); + } + + result.incNbImported(); + + if (result.getNbRowsImported() % 1000 == 0) { + transaction.commitTransaction(); + tic = ImportHelper.logTimeAndMemory(log, tic, + "contacts ligne " + currRow); + } + + } catch(ImportRefusedException eee) { + if (log.isWarnEnabled()) { + log.warn("Error during contact import row : " + + eee.getRowNumber(), eee); + } + result.addError(eee.getRowNumber(), eee.getMessage()); + result.incNbRefused(); } + } - if (company != null) { - String rowCode = ImportHelper.readSampleRowCode(reader); + // Commit for last rows imported + transaction.commitTransaction(); + } finally { + reader.close(); + } + return result; + } - SampleRow row = rowDAO.findByProperties( - SampleRow.CODE, rowCode, - SampleRow.COMPANY, company); + /** + * Will load a {@code contact} from reading data in {@code reader}. + * The order is important for loading the contact (state, observer, company, + * sampleRow, boat and others). + * + * @param reader which contains data from Csv file + * @param contact to load + * @param updateValidation if validations need to be loaded + * @throws IOException from CsvReader + * @throws TopiaException if an error occurs during ToPIA usage + * @throws ImportRefusedException when data is not correct to load contact + * @throws ParseException from ImportHelper + * @see ImportHelper + */ + protected void loadContactCsv(CsvReader reader, ContactInput contact, + boolean updateValidation) throws IOException, + TopiaException, + ImportRefusedException, + ParseException { - if (row != null) { - int boatImmatriculation = - ImportHelper.readInt(reader, BOAT.NAVS_COD); + contact.setContactState(ImportHelper.read(reader, CONTACT.CONT_ETAT)); - Boat boat = boatDAO.findByImmatriculation( - boatImmatriculation); + contact.setObserver(ImportHelper.read(reader, CONTACT.OBSERV_ID)); - if (boat != null) { + contact.initCompany(); - ElligibleBoatDAO elligibleDAO = - WaoDAOHelper.getElligibleBoatDAO(transaction); - ElligibleBoat elligible = - elligibleDAO.findByProperties( - ElligibleBoat.BOAT, boat, - ElligibleBoat.SAMPLE_ROW, row); + contact.setSampleRow(ImportHelper.readSampleRowCode(reader)); - if (elligible == null) { - // Create new elligible boat not active in a global way - elligible = elligibleDAO.create( - ElligibleBoat.BOAT, boat, - ElligibleBoat.SAMPLE_ROW, row); - if (log.isTraceEnabled()) { - log.trace("Create elligibleBoat for : " + - boat.getImmatriculation() + " - " + - row.getCode()); - } - } - elligible.setCompanyActive(Boolean.TRUE); + contact.setBoat(ImportHelper.readInt(reader, BOAT.NAVS_COD)); - Contact contact = null; + contact.setTideBeginDate( + ImportHelper.readDate(reader, CONTACT.CONT_DEBUT_MAREE)); + contact.setTideEndDate( + ImportHelper.readDate(reader, CONTACT.CONT_FIN_MAREE)); - String createDateString = - ImportHelper.read(reader, - CONTACT.CONT_CREATION); - String contactCode = - ImportHelper.read(reader, - CONTACT.CONT_CODE); - Date createDate = - ImportHelper.parseContactCreateDate( - contactCode, createDateString); + int nbObservants = + ImportHelper.readInt(reader, CONTACT.CONT_NB_OBSERV); + contact.setNbObservants( + nbObservants == -1 ? 0 : nbObservants); - if (log.isDebugEnabled()) { - log.debug("Ligne " + currRow + - " : Create date : " + createDate); - } + contact.setMammalsCapture( + ImportHelper.parseContactMammals(reader,CONTACT.CONT_MAM_CAPT)); - if (/*!StringUtils.isEmpty(contactCode) && */ - StringUtils.isNotEmpty(createDateString)) { - // Get entity from database - TopiaQuery query = dao.createQuery(). - add(TopiaEntity.TOPIA_CREATE_DATE, - createDate). - add(Contact.OBSERVER + "." + - WaoUser.COMPANY, company). - add(Contact.BOAT, boat). - add(Contact.SAMPLE_ROW, row); - contact = dao.findByQuery(query); - } + contact.setMammalsObservation( + ImportHelper.parseContactMammals(reader, CONTACT.CONT_MAM_OBS)); - if (contact != null && - contact.getValidationCompany() != null) { - result.addError(currRow, "Le contact est" + - " déjà validé dans l'application" + - " et ne peut pas être importé"); - result.incNbRefused(); - continue; - } + contact.setDataInputDate( + ImportHelper.readDate(reader, CONTACT.CONT_ALLEGRO)); - // new contact to import - boolean newContact = false; - if (contact == null) { - contact = dao.create( - TopiaEntity.TOPIA_CREATE_DATE, createDate, - Contact.SAMPLE_ROW, row, - Contact.BOAT, boat); - newContact = true; - } + if (updateValidation) { + if (log.isDebugEnabled()) { + log.debug("SuperAdmin import :: validations"); + } + contact.setValidationCompany( + ImportHelper.parseContactValidation(reader, + CONTACT.CONT_SOCIETE_VALID)); + contact.setValidationProgram( + ImportHelper.parseContactValidation(reader, + CONTACT.CONT_PROGRAM_VALID)); + } - Date tideBegin = - ImportHelper.readDate(reader, - CONTACT.CONT_DEBUT_MAREE); - Date tideEnd = - ImportHelper.readDate(reader, - CONTACT.CONT_FIN_MAREE); - Date dataInput = - ImportHelper.readDate(reader, - CONTACT.CONT_ALLEGRO); - int nbObservants = ImportHelper.readInt(reader, - CONTACT.CONT_NB_OBSERV); - if (nbObservants == -1) { - nbObservants = 0; - } - boolean mammalsCapture = - ImportHelper.parseContactMammals(reader, - CONTACT.CONT_MAM_CAPT); - boolean mammalsObsv = - ImportHelper.parseContactMammals(reader, - CONTACT.CONT_MAM_OBS); + // FIXME-FD20100416 : very strange behavior -> need to stop using topiaCreateDate + Date createDateCsv = + ImportHelper.readDate(reader, CONTACT.CONT_CREATION); + String contactCode = + ImportHelper.read(reader, CONTACT.CONT_CODE); + Date createDate = + ImportHelper.parseContactCreateDate( + contactCode, createDateCsv); - contact.setObserver(observer); - contact.setContactState(contactState); - contact.setTideBeginDate(tideBegin); - contact.setTideEndDate(tideEnd); - contact.setNbObservants(nbObservants); - contact.setMammalsCapture(mammalsCapture); - contact.setMammalsObservation(mammalsObsv); - contact.setDataInputDate(dataInput); + contact.setTopiaCreateDate(createDate); + } - // Import validations only for superadmin and a new contact : useful for archives - // FIXME : can update validation when the user is the super admin - if (newContact && user.isAdmin() && user.getLogin().equals("admin")) { - if (log.isDebugEnabled()) { - log.debug("SuperAdmin import :: validations"); - } - Boolean companyValidation = ImportHelper.parseContactValidation(reader, CONTACT.CONT_SOCIETE_VALID); - Boolean programValidation = ImportHelper.parseContactValidation(reader, CONTACT.CONT_PROGRAM_VALID); - contact.setValidationCompany(companyValidation); - contact.setValidationProgram(programValidation); + /** + * Update the SampleMonth data for tidesValue (estimated and real) from + * {@code contact} compared to its old state {@code oldContact}. The + * estimated is update when contact state {@link ContactState#BOARDING_DONE} + * is changed. The real is update when contact validationCompany is changed. + * The {@code calculateReal} flag determines if the real tides has to be + * calculated or not. + * + * @param transaction used to update the SampleMonth + * @param oldContact old state of the contact + * @param contact changed + * @param calculateReal to calculate real tides value + * @throws TopiaException + * @throws NullSampleMonthException if SampleMonth can't be found + */ + protected void updateSampleMonthTidesValue( + TopiaContext transaction, Contact oldContact, + Contact contact, boolean calculateReal) + throws TopiaException, NullSampleMonthException { - // Add realTideTime for this contact if validations are ok and state is BOARDING_DONE - if (BooleanUtils.isTrue(companyValidation) && BooleanUtils.isNotFalse(programValidation) && - contact.getContactState().equals(ContactState.BOARDING_DONE)) { - boolean ok = contact.getSampleRow().addRealTideTime(contact); - if (!ok) { - DateFormat dateFormat1 = new SimpleDateFormat("MM/yyyy"); - result.addError(currRow, "Impossible de mettre à jour le nombre de marée réels, vérifiez le mois " + - "de " + dateFormat1.format(contact.getTideBeginDate()) + " pour la ligne du plan " + row.getCode()); - result.incNbRefused(); - continue; - } - } - } + SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - //dao.update(contact); + if (log.isDebugEnabled()) { + log.debug("oldState = " + (oldContact != null ? + oldContact.getContactState() : "null") + + " _ newState = " + contact.getContactState()); + } - result.incNbImported(); + boolean oldContactDone = oldContact != null && + oldContact.getContactState().equals(ContactState.BOARDING_DONE); - } else { - result.addError(currRow, "Navire inexistant avec l'immatriculation : " + boatImmatriculation); - result.incNbRefused(); - } - } else { - result.addError(currRow, "Ligne d'échantillon inexistante ou incompatible avec la société " + - "pour le code : " + rowCode); - result.incNbRefused(); - } - } else { - result.addError(currRow, "Cet utilisateur n'est lié à aucune société : " + user.getFullName()); - result.incNbRefused(); + boolean newContactDone = contact.getContactState(). + equals(ContactState.BOARDING_DONE); + + boolean contactStateChanged = oldContact == null || + !contact.getContactState().equals(oldContact.getContactState()); + + SampleMonth sampleMonth = null; + // Estimated tides calcul + if ((oldContactDone || newContactDone) && contactStateChanged) { + if (log.isDebugEnabled()) { + log.debug("Calculate estimated tides value for date : " + + contact.getTideBeginDate()); + } + + sampleMonth = getExistingSampleMonthForContact(monthDAO, contact); + + if (oldContactDone) { + // dec estimatedTides + int estimated = sampleMonth.getEstimatedTidesValue(); + if (estimated > 0) { + sampleMonth.setEstimatedTidesValue(estimated - 1); } - } else { - result.addError(currRow, "Utilisateur inexistant avec l'identifiant : " + observerId); - result.incNbRefused(); + if (log.isDebugEnabled()) { + log.debug("Decrement : " + estimated + " -> " + + sampleMonth.getEstimatedTidesValue()); + } + } else if (newContactDone) { + // inc estimatedTides + int estimated = sampleMonth.getEstimatedTidesValue(); + sampleMonth.setEstimatedTidesValue(estimated + 1); + if (log.isDebugEnabled()) { + log.debug("Increment : " + estimated + " -> " + + sampleMonth.getEstimatedTidesValue()); + } } + } - if (result.getNbRowsImported() % 1000 == 0) { - transaction.commitTransaction(); - tic = ImportHelper.logTimeAndMemory(log, tic, "contacts ligne " + currRow); + // Real tides calcul (only if needed) + if (calculateReal) { + Boolean oldValidationCompany = oldContact != null ? + oldContact.getValidationCompany() : null; + Boolean newValidationCompany = contact.getValidationCompany(); + + boolean oldContactValidate = + BooleanUtils.isTrue(oldValidationCompany); + boolean newContactValidate = + BooleanUtils.isTrue(newValidationCompany); + + boolean contactValidationChanged = oldContact == null || + (oldValidationCompany != null && + !oldValidationCompany.equals(newValidationCompany)); + + if (log.isDebugEnabled()) { + log.debug("oldValidation = " + oldContactValidate + + " _ newValidation = " + newContactValidate); } + + if ((oldContactValidate || newContactValidate) && + contactValidationChanged) { + if (log.isDebugEnabled()) { + log.debug("Calculate real tides value for date : " + + contact.getTideBeginDate()); + } + + // Do not retrieve the sampleMonth if it is already defined from + // previous calcul on estimatedTidesValue + if (sampleMonth == null) { + sampleMonth = getExistingSampleMonthForContact( + monthDAO, contact); + } + + if (oldContactValidate) { + // dec realTides + int real = sampleMonth.getRealTidesValue(); + if (real > 0) { + sampleMonth.setRealTidesValue(real - 1); + } + if (log.isDebugEnabled()) { + log.debug("Decrement : " + real + " -> " + + sampleMonth.getRealTidesValue()); + } + } else if (newContactValidate) { + // inc realTides + int real = sampleMonth.getRealTidesValue(); + sampleMonth.setRealTidesValue(real + 1); + if (log.isDebugEnabled()) { + log.debug("Increment : " + real + " -> " + + sampleMonth.getRealTidesValue()); + } + } + } } + } - transaction.commitTransaction(); + /** + * This exception is used to indicate that a problem is occured during + * retrieving sampleMonth corresponding to a contact. + * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) + */ + public static final class NullSampleMonthException extends Exception { - //transaction.closeContext(); -// } catch (ParseException eee) { -// context.serviceException(transaction, -// "Erreur ligne " + currRow + " : " + -// "Le format des dates est incorrect, il doit être de la forme : JJ/MM/AAAA", eee); -// } catch (Exception eee) { -// if (log.isDebugEnabled()) { -// try { -// log.debug("Ligne : " + currRow + " :: " + Arrays.toString(reader.getValues())); -// } catch (IOException ex) { -// log.error("Reader error", ex); -// } -// } -// context.serviceException(transaction, -// "Impossible d'importer les contacts", eee); -// } finally { -// context.closeTransaction(transaction); -// } + private static final long serialVersionUID = 1L; + + public NullSampleMonthException(String message) { + super(message); + } + } + + /** + * Retrieve existing sampleMonth corresponding to the {@code contact}. The + * sampleMonth must match with contact sampleRow, also the tideBeginDate + * (day) of the contact must match the sampleMonth periodDate (month). + * + * @param monthDAO used to find the sampleMonth + * @param contact reference + * @return the sampleMonth found if exists, or NullSampleMonthException + * will be thrown + * @throws TopiaException + * @throws NullSampleMonthException if month was not found + */ + protected SampleMonth getExistingSampleMonthForContact( + SampleMonthDAO monthDAO, Contact contact) + throws TopiaException, NullSampleMonthException { + TopiaQuery query = monthDAO.createQuery(); + + PeriodDates period = new PeriodDates( + contact.getTideBeginDate(), contact.getTideBeginDate()); + period.initDayOfMonthExtremities(); + + // Bind sampleMonth.sampleRow with contact sampleRow + query.add(SampleMonth.SAMPLE_ROW, contact.getSampleRow()). + add(SampleMonth.PERIOD_DATE + " BETWEEN :fromDate AND :thruDate"). + addParam("fromDate", period.getFromDate()). + addParam("thruDate", period.getThruDate()); + //add(SampleMonth.PERIOD_DATE, period); + SampleMonth result = monthDAO.findByQuery(query); + if (result == null) { + throw new NullSampleMonthException("Aucun mois correspondant pour" + + " la ligne du plan d'échantillonnage " + + contact.getSampleRow().getCode() + + " et la date de début de marée du contact " + + contact.getTideBeginDate()); + } return result; } + /** + * Update the elligible boat depends on contact creation. The + * {@code contact} reference can only be created for a sampleRow and a + * boat if both are linked with an elligibleBoat. So this method is + * used to create the link if needed during contacts import. This + * elligibleBoat is needed for the contact owned by a company, so + * the companyActive property of ElligibleBoat will be set to TRUE. No + * admin has decided to explicitly create this link. + * + * @param transaction used to update the ElligibleBoat + * @param contact which contains sampleRow and boat to link + * @throws TopiaException + */ + protected void updateElligibleBoatForContact(TopiaContext transaction, + Contact contact) throws TopiaException { + + Boat boat = contact.getBoat(); + SampleRow row = contact.getSampleRow(); + + ElligibleBoatDAO elligibleDAO = + WaoDAOHelper.getElligibleBoatDAO(transaction); + ElligibleBoat elligible = + elligibleDAO.findByProperties( + ElligibleBoat.BOAT, contact.getBoat(), + ElligibleBoat.SAMPLE_ROW, contact.getSampleRow()); + + if (elligible == null) { + // Create new elligible boat not active in a global way + elligible = elligibleDAO.create( + ElligibleBoat.BOAT, boat, + ElligibleBoat.SAMPLE_ROW, row); + if (log.isTraceEnabled()) { + log.trace("Create elligibleBoat for : " + + boat.getImmatriculation() + " - " + + row.getCode()); + } + } + elligible.setCompanyActive(Boolean.TRUE); + } + } Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-04-16 14:42:50 UTC (rev 450) @@ -30,6 +30,7 @@ wao.error.serviceContact.getNewContact= wao.error.serviceContact.importContactCsv= wao.error.serviceContact.saveContact= +wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNews= wao.error.serviceNews.saveNews= wao.error.serviceReferential.getCodesDCF5Contains= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-16 14:42:50 UTC (rev 450) @@ -29,6 +29,7 @@ wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact +wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getCodesDCF5Contains= Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-16 14:42:50 UTC (rev 450) @@ -8,6 +8,7 @@ <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> + <property name="estimatedTidesValue" type="int" access="field" column="estimatedTidesValue" node="estimatedTidesValue"/> <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> </class> </hibernate-mapping> Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-16 14:42:50 UTC (rev 450) @@ -157,7 +157,7 @@ return instance; } - public ServiceContact getServiceContact() { + public ServiceContactImpl getServiceContact() { ServiceContactImpl instance = new ServiceContactImpl(); instance.setContext(getContext()); return instance; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-16 14:42:50 UTC (rev 450) @@ -155,6 +155,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.BOARDING_DONE); + contact1.setTideBeginDate(DateUtils.createDate(3, 3, 2010)); serviceContact.saveContact(contact1, false); result = boat.canCreateContact(company); @@ -204,35 +205,55 @@ WaoUser.COMPANY, company2); company2.addWaoUser(user2); + transaction.commitTransaction(); + + FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); + FishingZone zoneIId = zoneDAO.create(FishingZone.DISTRICT_CODE, "IId"); + FishingZone zoneIV = zoneDAO.create(FishingZone.DISTRICT_CODE, "IV"); + FishingZone zoneI = zoneDAO.create(FishingZone.DISTRICT_CODE, "I"); + + transaction.commitTransaction(); + + ServiceSampling serviceSampling = manager.getServiceSampling(); + input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + serviceSampling.importSamplingPlanCsv(input); + + SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); + SampleRow row = rowDAO.findByCode("2010_0001"); + SampleRow row2 = rowDAO.findByCode("2009_0006"); + row.getCompany(); + row.getProfession(); + row.sizeElligibleBoat(); + row.sizeSampleMonth(); + row2.getCompany(); + row2.getProfession(); + row2.sizeElligibleBoat(); + row2.sizeSampleMonth(); + // BoatInfosDAO boatInfosDAO = WaoDAOHelper.getBoatInfosDAO(transaction); // BoatInfos boatInfos = boatInfosDAO.create(BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); - transaction.commitTransaction(); transaction.closeContext(); ServiceContact serviceContact = manager.getServiceContact(); // First contact : OK - Contact contact1 = new ContactImpl(); - contact1.setBoat(boat); - contact1.setObserver(user); + Contact contact1 = serviceContact.getNewContact(user, row, boat); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2009); + Date begin = DateUtils.createDate(3, 5, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); /** EXEC METHOD **/ - Date fromDate = DateUtils.createDate(1, 1, 2009); + Date fromDate = DateUtils.createDate(1, 5, 2010); int result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact2 = new ContactImpl(); + Contact contact2 = serviceContact.getNewContact(user, row, boat); // Second contact with ValidationProgram = FALSE - contact2.setBoat(boat); - contact2.setObserver(user); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 8, 2009); + begin = DateUtils.createDate(3, 8, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); contact2.setValidationProgram(Boolean.FALSE); @@ -241,12 +262,10 @@ result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact3 = new ContactImpl(); + Contact contact3 = serviceContact.getNewContact(user, row, boat); // Third contact with tideBeginDate < fromDate - contact3.setBoat(boat); - contact3.setObserver(user); contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 8, 2008); + begin = DateUtils.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -254,12 +273,10 @@ result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact4 = new ContactImpl(); + Contact contact4 = serviceContact.getNewContact(user2, row2, boat); // Fourth contact : OK with an other company - contact4.setBoat(boat); - contact4.setObserver(user2); contact4.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 4, 2009); + begin = DateUtils.createDate(3, 5, 2010); contact4.setTideBeginDate(begin); contact4.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact4, false); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-16 14:42:50 UTC (rev 450) @@ -140,8 +140,7 @@ calendar.set(Calendar.SECOND, 50); calendar.set(Calendar.MILLISECOND, 260); String expResult = "100150260"; - DateFormat timeFormat = CONTACT.getTimeFormat(); - String result = timeFormat.format(calendar.getTime()); + String result = CONTACT.TIME_FORMAT.format(calendar.getTime()); assertEquals(expResult, result); } @@ -160,7 +159,8 @@ calendar.set(Calendar.SECOND, 50); calendar.set(Calendar.MILLISECOND, 718); Date expResult = calendar.getTime(); - Date result = ImportHelper.parseContactCreateDate(code, "23/10/2009"); + Date date = DateUtils.createDate(23,10,2009); + Date result = ImportHelper.parseContactCreateDate(code, date); assertEquals(expResult, result); } Added: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-16 14:42:50 UTC (rev 450) @@ -0,0 +1,431 @@ + +package fr.ifremer.wao.service; + +import com.csvreader.CsvReader; +import fr.ifremer.wao.TestManager; +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.BoatDAO; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.CompanyDAO; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.SampleMonth; +import fr.ifremer.wao.entity.SampleMonthDAO; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRowDAO; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserDAO; +import fr.ifremer.wao.io.ContactInput; +import fr.ifremer.wao.io.ImportRefusedException; +import fr.ifremer.wao.io.WaoCsvHeader.BOAT; +import fr.ifremer.wao.io.WaoCsvHeader.CONTACT; +import fr.ifremer.wao.io.WaoCsvHeader.SAMPLING; +import fr.ifremer.wao.service.ServiceContactImpl.NullSampleMonthException; +import java.io.IOException; +import java.text.ParseException; +import java.util.Date; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import static org.mockito.Mockito.*; +import static org.junit.Assert.*; + +/** + * ServiceContactImplTest + * + * Created: 16 avr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ServiceContactImplTest { + + private static TestManager manager; + + private static final Logger logger = + LoggerFactory.getLogger(ServiceContactImplTest.class); + + private ServiceContactImpl service; + + @BeforeClass + public static void setUpClass() throws Exception { + manager = new TestManager(); + } + + @Before + public void setUp() throws Exception { + manager.start(); + MockitoAnnotations.initMocks(this); + service = manager.getServiceContact(); + sampleMonth = null; + sampleRow = null; + boat = null; + company = null; + observer = null; + } + + @After + public void tearDown() throws Exception { + manager.stop(); + } + + // Real data + protected SampleRow sampleRow; + protected SampleMonth sampleMonth; + protected Boat boat; + protected Company company; + protected WaoUser observer; + + // Mock data + @Mock + protected Contact contact; + @Mock + protected Contact contactReference; + @Mock + protected WaoUser creator; + @Mock + protected CsvReader reader; + + protected void prepareData(boolean needBoat, boolean needObserver) + throws TopiaException { + logger.info("Prepare data :"); + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + + if (needObserver) { + CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); + company = companyDAO.create(Company.NAME, "TARTANPION"); + + WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); + observer = userDAO.create( + WaoUser.COMPANY, company, + WaoUser.LOGIN, "jmichmuche", + WaoUser.FIRST_NAME, "Jean", + WaoUser.LAST_NAME, "Michmuche", + WaoUser.ROLE, UserRole.OBSERVER.ordinal()); + + when(contact.getObserver()).thenReturn(observer); + } + + SampleRowDAO rowDAO = + WaoDAOHelper.getSampleRowDAO(transaction); + logger.info("SampleRow : 2010_0001"); + sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", + SampleRow.COMPANY, company); + + SampleMonthDAO monthDAO = + WaoDAOHelper.getSampleMonthDAO(transaction); + logger.info("SampleMonth : 03/2010 _ row 2010_0001"); + Date monthDate = DateUtils.createDate(1, 3, 2010); + sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, + SampleMonth.PERIOD_DATE, monthDate); + + Date contactDate = DateUtils.createDate(18, 3, 2010); + when(contact.getTideBeginDate()).thenReturn(contactDate); + when(contact.getSampleRow()).thenReturn(sampleRow); + + if (needBoat) { + BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); + boat = boatDAO.create(Boat.IMMATRICULATION, 175846); + when(contact.getBoat()).thenReturn(boat); + } + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + } + + @Test + public void testGetExistingSampleMonthForContact() + throws TopiaException, NullSampleMonthException { + logger.info("testGetExistingSampleMonthForContact"); + + /** PREPARE DATA **/ + prepareData(false, false); + + /** EXEC METHOD **/ + logger.info("test 1 : SampleMonth exists for contact"); + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + SampleMonthDAO monthDAO = + WaoDAOHelper.getSampleMonthDAO(transaction); + + // Contact is valid for the sampleMonth + + SampleMonth result = + service.getExistingSampleMonthForContact(monthDAO, contact); + + assertEquals(sampleMonth, result); + + } finally { + transaction.closeContext(); + } + + logger.info("test 2 : contact tideBeginDate doesn't match with any" + + " SampleMonth"); + transaction = manager.getContext().beginTransaction(); + try { + SampleMonthDAO monthDAO = + WaoDAOHelper.getSampleMonthDAO(transaction); + + Date contactDate = DateUtils.createDate(18, 10, 2010); + when(contact.getTideBeginDate()).thenReturn(contactDate); + + service.getExistingSampleMonthForContact(monthDAO, contact); + } catch (Exception eee) { + logger.error("Error : " + eee.getMessage()); + assertEquals(NullSampleMonthException.class, eee.getClass()); + } finally { + transaction.closeContext(); + } + } + + @Test + public void testUpdateSampleMonthTidesValue() throws TopiaException, NullSampleMonthException { + logger.info("testUpdateSampleMonthTidesValue"); + + /** PREPARE DATA **/ + prepareData(false, false); + Date tideBeginDate = contact.getTideBeginDate(); + when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate); + when(contactReference.getSampleRow()).thenReturn(sampleRow); + + /** EXEC METHOD **/ + logger.info("test 1 : ContactState changed from null to BOARDING_DONE" + + " -> increment estimated tides value"); + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + when(contact.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + + service.updateSampleMonthTidesValue(transaction, null, + contact, false); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 1 : verification sampleMonth estimated tides = 1"); + checkTidesValue(1, false); + + logger.info("test 2 : ContactState changed from BOARDING_DONE to " + + "BOAT_REFUSED -> decrement estimated tides value"); + transaction = manager.getContext().beginTransaction(); + try { + when(contact.getContactState()). + thenReturn(ContactState.BOAT_REFUSED); + + when(contactReference.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, false); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 2 : verification sampleMonth estimated tides = 0"); + checkTidesValue(0, false); + + when(contact.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + + logger.info("test 3 : CompanyValidation changed from null to " + + "FALSE -> do nothing"); + transaction = manager.getContext().beginTransaction(); + try { + when(contact.getValidationCompany()).thenReturn(Boolean.FALSE); + + when(contactReference.getValidationCompany()).thenReturn(null); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 3 : verification sampleMonth real tides = 0"); + checkTidesValue(0, true); + + logger.info("test 4 : CompanyValidation changed from FALSE to " + + "TRUE -> increment real tides value"); + transaction = manager.getContext().beginTransaction(); + try { + when(contact.getValidationCompany()).thenReturn(Boolean.TRUE); + + when(contactReference.getValidationCompany()). + thenReturn(Boolean.FALSE); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 4 : verification sampleMonth real tides = 1"); + checkTidesValue(1, true); + } + + protected void checkTidesValue(int expected, boolean real) + throws TopiaException { + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); + + SampleMonth result = dao.findByTopiaId(sampleMonth.getTopiaId()); + int test = real ? result.getRealTidesValue() : + result.getEstimatedTidesValue(); + assertEquals(expected, test); + } finally { + transaction.closeContext(); + } + } + + @Test + public void testLoadContactCsv() throws TopiaException, + WaoBusinessException, + IOException, + ImportRefusedException, + ImportRefusedException, + ParseException { + logger.info("testUpdateSampleMonthTidesValue"); + + /** PREPARE DATA **/ + prepareData(true, true); + + when(reader.get(CONTACT.CONT_ETAT.name())). + thenReturn(ContactState.BOARDING_DONE.libelle()); + when(reader.get(CONTACT.OBSERV_ID.name())). + thenReturn(observer.getLogin()); + when(reader.get(SAMPLING.PLAN_CODE.name())). + thenReturn(sampleRow.getCode()); + when(reader.get(BOAT.NAVS_COD.name())). + thenReturn(String.valueOf(boat.getImmatriculation())); + when(reader.get(CONTACT.CONT_DEBUT_MAREE.name())). + thenReturn("22/03/2010"); + when(reader.get(CONTACT.CONT_FIN_MAREE.name())). + thenReturn("22/03/10"); + when(reader.get(CONTACT.CONT_NB_OBSERV.name())). + thenReturn("1"); + when(reader.get(CONTACT.CONT_MAM_CAPT.name())). + thenReturn(""); + when(reader.get(CONTACT.CONT_MAM_OBS.name())). + thenReturn("X"); + when(reader.get(CONTACT.CONT_ALLEGRO.name())). + thenReturn("25/03/2010"); + when(reader.get(CONTACT.CONT_SOCIETE_VALID.name())). + thenReturn("A"); + when(reader.get(CONTACT.CONT_PROGRAM_VALID.name())). + thenReturn(""); + when(reader.get(CONTACT.CONT_CREATION.name())). + thenReturn("18/03/10"); + when(reader.get(CONTACT.CONT_CODE.name())). + thenReturn(""); + + when(creator.getCompany()).thenReturn(company); + when(creator.isAdmin()).thenReturn(false); + when(creator.getLogin()).thenReturn(observer.getLogin()); + + /** EXEC METHOD **/ + + logger.info("test 1 : load contact by Creator jmichmuche -> no error"); + ContactInput result = new ContactInput(); + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + result.initialize(transaction, creator, 1); + service.loadContactCsv(reader, result, false); + Date createDate = DateUtils.createDate(18,3,2010); + assertEquals(createDate, result.getTopiaCreateDate()); + assertEquals(ContactState.BOARDING_DONE, result.getContactState()); + assertEquals(observer, result.getObserver()); + assertEquals(sampleRow, result.getSampleRow()); + assertEquals(boat, result.getBoat()); + assertEquals(DateUtils.createDate(22,3,2010), + result.getTideBeginDate()); + assertEquals(DateUtils.createDate(22,3,2010), + result.getTideEndDate()); + assertEquals(1, result.getNbObservants()); + assertFalse(result.getMammalsCapture()); + assertTrue(result.getMammalsObservation()); + assertEquals(DateUtils.createDate(25,3,2010), + result.getDataInputDate()); + // No validation update : creator is not an admin + assertNull(result.getValidationCompany()); + assertNull(result.getValidationProgram()); + } finally { + transaction.closeContext(); + } + + logger.info("test 2 : Error on boat"); + when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); + checkImportError(Contact.BOAT); + // Reinit boat + when(reader.get(BOAT.NAVS_COD.name())). + thenReturn(String.valueOf(boat.getImmatriculation())); + + logger.info("test 3 : Error on company"); + when(creator.getCompany()).thenReturn(null); + checkImportError(WaoUser.COMPANY); + // Reinit creator company + when(creator.getCompany()).thenReturn(company); + + logger.info("test 4 : Error on observer"); + when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); + checkImportError(Contact.OBSERVER); + // Reinit observer + when(reader.get(CONTACT.OBSERV_ID.name())). + thenReturn(observer.getLogin()); + + logger.info("test 5 : Error on sampleRow"); + when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); + checkImportError(Contact.SAMPLE_ROW); + // Reinit sampleRow + when(reader.get(SAMPLING.PLAN_CODE.name())). + thenReturn(sampleRow.getCode()); + + logger.info("test 6 : Error on state"); + when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); + checkImportError(Contact.STATE); + // Reinit state + when(reader.get(CONTACT.CONT_ETAT.name())). + thenReturn(ContactState.BOARDING_DONE.libelle()); + } + + protected void checkImportError(String field) throws TopiaException { + ContactInput result = new ContactInput(); + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + result.initialize(transaction, creator, 1); + service.loadContactCsv(reader, result, false); + } catch (Exception eee) { + logger.error("Error : " + eee.getMessage()); + assertEquals(ImportRefusedException.class, eee.getClass()); + ImportRefusedException ex = (ImportRefusedException)eee; + assertEquals(field, ex.getField()); + } finally { + transaction.closeContext(); + } + } +} Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-16 14:42:50 UTC (rev 450) @@ -157,7 +157,7 @@ contact1.setObserver(user); contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2009); + Date begin = DateUtils.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -167,7 +167,7 @@ contact2.setObserver(user); contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2009); + begin = DateUtils.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -177,7 +177,7 @@ contact3.setObserver(user); contact3.setSampleRow(row); contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2009); + begin = DateUtils.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -248,7 +248,7 @@ // 1 real observer over 1 contact1.setNbObservants(1); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2009); + Date begin = DateUtils.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -260,7 +260,7 @@ // 2 real observer over 1 contact2.setNbObservants(2); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2009); + begin = DateUtils.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -272,7 +272,7 @@ // 1 real observer over 2 contact3.setNbObservants(1); contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2009); + begin = DateUtils.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -341,6 +341,7 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row = rowDAO.findByCode("2010_0001"); + SampleRow row2 = rowDAO.findByCode("2009_0006"); transaction.closeContext(); @@ -349,44 +350,56 @@ // Contacts for company TARTANPION Contact contact1 = new ContactImpl(); + contact1.setBoat(boat); contact1.setObserver(user); + contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2009); + Date begin = DateUtils.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); serviceContact.saveContact(contact1, false); Contact contact2 = new ContactImpl(); + contact2.setBoat(boat); contact2.setObserver(user); + contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 10, 2009); + begin = DateUtils.createDate(3, 10, 2010); contact2.setTideBeginDate(begin); serviceContact.saveContact(contact2, false); Contact contact3 = new ContactImpl(); + contact3.setBoat(boat); contact3.setObserver(user); + contact3.setSampleRow(row); contact3.setContactState(ContactState.BOAT_REFUSED); - begin = DateUtils.createDate(3, 5, 2009); + begin = DateUtils.createDate(3, 5, 2010); contact3.setTopiaCreateDate(begin); serviceContact.saveContact(contact3, false); // Contacts for company BIS Contact contact4 = new ContactImpl(); + contact4.setBoat(boat2); contact4.setObserver(user2); + contact4.setSampleRow(row2); contact4.setContactState(ContactState.BOARDING_EXPECTED); - begin = DateUtils.createDate(3, 5, 2009); + begin = DateUtils.createDate(3, 3, 2010); contact4.setTopiaCreateDate(begin); serviceContact.saveContact(contact4, false); Contact contact5 = new ContactImpl(); + contact5.setBoat(boat2); contact5.setObserver(user2); + contact5.setSampleRow(row2); contact5.setContactState(ContactState.BOAT_UNAVAILABLE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtils.createDate(3, 5, 2010); contact5.setTopiaCreateDate(begin); serviceContact.saveContact(contact5, false); // Contact refused by program, will not be in result Contact contact6 = new ContactImpl(); + contact6.setBoat(boat2); contact6.setObserver(user2); + contact6.setSampleRow(row2); contact6.setContactState(ContactState.BOAT_UNAVAILABLE); begin = DateUtils.createDate(3, 3, 2010); contact6.setTopiaCreateDate(begin); @@ -426,9 +439,9 @@ assertEquals(1, data.get(ContactState.BOARDING_EXPECTED).intValue()); assertEquals(1, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); - // result for period 3/5/2009 to 3/10/2009 for BIS company - begin = DateUtils.createDate(3, 5, 2009); - Date end = DateUtils.createDate(31, 10, 2009); + // result for period 3/1/2010 to 31/3/2010 for BIS company + begin = DateUtils.createDate(3, 1, 2010); + Date end = DateUtils.createDate(31, 3, 2010); PeriodDates period = new PeriodDates(begin, end); results = service.getContactStateStatistics(company2, period); @@ -492,28 +505,34 @@ ServiceContact serviceContact = manager.getServiceContact(); // First contact : OK Contact contact1 = new ContactImpl(); + contact1.setBoat(boat); contact1.setObserver(user); - Date begin = DateUtils.createDate(3, 3, 2009); + contact1.setSampleRow(row); + Date begin = DateUtils.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); - Date inputDate = DateUtils.createDate(15, 4, 2009); + Date inputDate = DateUtils.createDate(15, 4, 2010); contact1.setDataInputDate(inputDate); contact1.setContactState(ContactState.BOARDING_DONE); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); Contact contact2 = new ContactImpl(); + contact2.setBoat(boat); contact2.setObserver(user); - begin = DateUtils.createDate(3, 3, 2009); + contact2.setSampleRow(row); + begin = DateUtils.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); - inputDate = DateUtils.createDate(15, 3, 2009); + inputDate = DateUtils.createDate(15, 3, 2010); contact2.setDataInputDate(inputDate); contact2.setContactState(ContactState.BOARDING_DONE); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); Contact contact3 = new ContactImpl(); + contact3.setBoat(boat2); contact3.setObserver(user2); - begin = DateUtils.createDate(3, 3, 2009); + contact3.setSampleRow(row2); + begin = DateUtils.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setDataInputDate(begin); contact3.setContactState(ContactState.BOARDING_DONE); Property changes on: trunk/wao-business/src/test/resources/import ___________________________________________________________________ Added: svn:ignore + .~lock.echantillonnage.csv# Modified: trunk/wao-business/src/test/resources/log4j.properties =================================================================== --- trunk/wao-business/src/test/resources/log4j.properties 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-business/src/test/resources/log4j.properties 2010-04-16 14:42:50 UTC (rev 450) @@ -8,6 +8,6 @@ log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n -log4j.logger.fr.ifremer.wao=INFO +log4j.logger.fr.ifremer.wao=DEBUG log4j.logger.org.nuiton.util=INFO log4j.logger.org.nuiton.util.beans.BinderProvider=ERROR Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-15 10:24:24 UTC (rev 449) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-16 14:42:50 UTC (rev 450) @@ -228,4 +228,10 @@ new ApplicationStateContribution("session", creator)); } +// public void contributeValidationMessagesSource(OrderedConfiguration<String> configuration) { +// configuration.add("myValidationMessages", "jumpstart/web/validators/ValidationMessages"); +// configuration.add("myTranslationMessages", "jumpstart/web/translators/TranslationMessages"); +// } + + }

1 0

[Suiviobsmer-commits] r449 - in trunk/wao-business/src/main: java/fr/ifremer/wao java/fr/ifremer/wao/service resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity
by fdesbois＠users.labs.libre-entreprise.org April 15, 2010

April 15, 2010

Author: fdesbois Date: 2010-04-15 10:24:24 +0000 (Thu, 15 Apr 2010) New Revision: 449 Log: Clean code for ActivityCalendarAccessLogger + hibernate mapping change during generation (DOCTYPE tag is moved to top) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-15 10:24:24 UTC (rev 449) @@ -47,70 +47,70 @@ * @param property * @return String */ - public String getProperty(WaoProperty property); + String getProperty(WaoProperty property); /** * isActivityCalendarImportRun : * @return boolean */ - public boolean isActivityCalendarImportRun(); + boolean isActivityCalendarImportRun(); /** * getConfiguration : * @return ApplicationConfig */ - public ApplicationConfig getConfiguration(); + ApplicationConfig getConfiguration(); /** * start : * @param serviceUser */ - public void start(ServiceUser serviceUser); + void start(ServiceUser serviceUser); /** * stop : */ - public void stop(); + void stop(); /** * setActivityCalendarImportRun : * @param run */ - public void setActivityCalendarImportRun(boolean run); + void setActivityCalendarImportRun(boolean run); /** * createRandomString : * @param length * @return String */ - public String createRandomString(int length); + String createRandomString(int length); /** * encodeString : * @param str * @return String */ - public String encodeString(String str); + String encodeString(String str); /** * convertId : * @param topiaId * @return String */ - public String convertId(String topiaId); + String convertId(String topiaId); /** * getCsvCharset : * @return Charset */ - public Charset getCsvCharset(); + Charset getCsvCharset(); /** * prepareSampleRowCode : * @param code * @return String */ - public String prepareSampleRowCode(String code); + String prepareSampleRowCode(String code); /** * prepareTopiaId : @@ -119,7 +119,8 @@ * @param entity * @return boolean */ - public <E extends TopiaEntity> boolean prepareTopiaId(Class<E> entityClass, E entity); + <E extends TopiaEntity> boolean prepareTopiaId(Class<E> entityClass, + E entity); /** * sendEmail : @@ -128,20 +129,32 @@ * @param msg * @throws EmailException */ - public void sendEmail(String to, String subject, String msg) throws EmailException; + void sendEmail(String to, String subject, String msg) throws EmailException; /** * getCurrentDate : * @return Date */ - public Date getCurrentDate(); + Date getCurrentDate(); /** + * Retrieve the activityCalendarAccessLogger to manage logging for user + * which access to boat activity calendars. This method will create the + * correct appender if not already defined in the contet (1 file of 10MB + * with name defined by {@link WaoProperty#FILENAME_LOG_ACTIVITY_ACCESS} ). + * + * @return the existing ActivityCalendarAccessLogger or a new one if not + * already defined in context. + * @since 1.2 + */ + org.apache.log4j.Logger getActivityCalendarAccessLogger(); + + /** * beginTransaction : * @return TopiaContext * @throws TopiaException */ - public TopiaContext beginTransaction() throws TopiaException; + TopiaContext beginTransaction() throws TopiaException; /** * treateError : @@ -150,7 +163,8 @@ * @param args * @throws WaoException */ - public void treateError(Exception eee, String message, Object... args) throws WaoException; + void treateError(Exception eee, String message, Object... args) + throws WaoException; /** * treateError : @@ -160,13 +174,14 @@ * @param args * @throws WaoException */ - public void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException; + void treateError(TopiaContext transaction, Exception eee, String message, + Object... args) throws WaoException; /** * closeTransaction : * @param transaction */ - public void closeTransaction(TopiaContext transaction); + void closeTransaction(TopiaContext transaction); } //WaoContext Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-15 10:24:24 UTC (rev 449) @@ -28,6 +28,7 @@ package fr.ifremer.wao; +import fr.ifremer.wao.entity.ActivityCalendar; import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.service.ServiceUser; import java.nio.charset.Charset; @@ -38,6 +39,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; +import org.apache.log4j.Level; +import org.apache.log4j.PatternLayout; +import org.apache.log4j.RollingFileAppender; import org.hibernate.exception.SQLGrammarException; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; @@ -67,16 +71,21 @@ private static final Logger log = LoggerFactory.getLogger(WaoContextImpl.class); - private boolean activityCalendarImport; + private static final String DEFAULT_FILENAME = "Wao.properties"; - private Date currentDate; + private static final String APP_NAME = "wao"; + private static final String ACTIVITY_CALENDAR_ACCESS_APPENDER_NAME = + "ActivityCalendarAccess"; + private ApplicationConfig configuration; - private static final String DEFAULT_FILENAME = "Wao.properties"; + private Date currentDate; - private static final String APP_NAME = "wao"; + private boolean activityCalendarImport; + private org.apache.log4j.Logger activityCalendarAccessLogger; + @Override public Date getCurrentDate() { if (currentDate == null) { @@ -239,6 +248,11 @@ log.info("Stop Wao"); } getTopiaRootContext().closeContext(); + // Close Appender from ActivityCalendarAccessLogger + if (activityCalendarAccessLogger != null) { + activityCalendarAccessLogger.getAppender( + ACTIVITY_CALENDAR_ACCESS_APPENDER_NAME).close(); + } } catch (Exception eee) { treateError(eee, n_("wao.error.context.stop")); } @@ -269,40 +283,37 @@ return activityCalendarImport; } - // FIXME-FD20100415 : Uncomment this code : Ano #2246 -// @Override -// public void addActivityCalendarAccessLog(String message) throws IOException { -// if (activityCalendarAccessLogger == null) { -// // Define appender configuration only once -// String filename = -// WaoProperty.FILENAME_LOG_ACTIVITY_ACCESS.getValue(); -// -// PatternLayout layout = new PatternLayout(); -// layout.setConversionPattern("%d %m%n"); -// RollingFileAppender appender = new RollingFileAppender(); -// appender.setName("ActivityCalendarAccess"); -// appender.setFile(filename); -// appender.setImmediateFlush(true); -// appender.setMaxFileSize("2MB"); + /** + * @see WaoContext#getActivityCalendarAccessLogger() + */ + @Override + public org.apache.log4j.Logger getActivityCalendarAccessLogger() { + if (activityCalendarAccessLogger == null) { + // Define appender configuration only once + String filename = + WaoProperty.FILENAME_LOG_ACTIVITY_ACCESS.getValue(); + + PatternLayout layout = new PatternLayout(); + layout.setConversionPattern("%d %m%n"); + RollingFileAppender appender = new RollingFileAppender(); + appender.setName(ACTIVITY_CALENDAR_ACCESS_APPENDER_NAME); + appender.setFile(filename); + appender.setImmediateFlush(true); + appender.setMaxFileSize("10MB"); // appender.setMaxBackupIndex(10); -// appender.setAppend(true); -// appender.setThreshold(Level.INFO); -// appender.setLayout(layout); -// appender.activateOptions(); -// -// activityCalendarAccessLogger = -// org.apache.log4j.Logger.getLogger(ActivityCalendar.class); -// -// activityCalendarAccessLogger.addAppender(appender); -// } -// -// if (log.isDebugEnabled()) { -// log.debug("message : " + message); -// } -// -// activityCalendarAccessLogger.info(message); -// } + appender.setAppend(true); + appender.setThreshold(Level.INFO); + appender.setLayout(layout); + appender.activateOptions(); + activityCalendarAccessLogger = + org.apache.log4j.Logger.getLogger(ActivityCalendar.class); + + activityCalendarAccessLogger.addAppender(appender); + } + return activityCalendarAccessLogger; + } + @Override public void treateError(Exception eee, String message, Object... args) throws WaoException { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-15 10:24:24 UTC (rev 449) @@ -55,8 +55,6 @@ private static WaoContext context; - private static org.apache.log4j.Logger activityCalendarAccessLogger; - static void setContext(WaoContext context) { WaoUtils.context = context; } @@ -72,41 +70,7 @@ public static Date getCurrentDate() { return context.getCurrentDate(); } - - // TEMP - public static void addActivityCalendarAccessLog(String message) - throws IOException { - if (activityCalendarAccessLogger == null) { - // Define appender configuration only once - String filename = - WaoProperty.FILENAME_LOG_ACTIVITY_ACCESS.getValue(); - PatternLayout layout = new PatternLayout(); - layout.setConversionPattern("%d %m%n"); - RollingFileAppender appender = new RollingFileAppender(); - appender.setName("ActivityCalendarAccess"); - appender.setFile(filename); - appender.setImmediateFlush(true); - appender.setMaxFileSize("2MB"); - appender.setMaxBackupIndex(10); - appender.setAppend(true); - appender.setThreshold(Level.INFO); - appender.setLayout(layout); - appender.activateOptions(); - - activityCalendarAccessLogger = - org.apache.log4j.Logger.getLogger(ActivityCalendar.class); - - activityCalendarAccessLogger.addAppender(appender); - } - - if (logger.isDebugEnabled()) { - logger.debug("message : " + message); - } - - activityCalendarAccessLogger.info(message); - } - /** * This method must be removed. Use {@link WaoContext} instance instead. * Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-15 10:24:24 UTC (rev 449) @@ -62,6 +62,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Level; +import org.apache.log4j.PatternLayout; +import org.apache.log4j.RollingFileAppender; import org.nuiton.topia.TopiaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,11 +78,13 @@ */ public class ServiceBoatImpl extends ServiceBoatAbstract { - private static final Logger log = + private static final Logger logger = LoggerFactory.getLogger(ServiceBoatImpl.class); private WaoContext context; + private org.apache.log4j.Logger activityCalendarAccessLogger; + public void setContext(WaoContext context) { this.context = context; } @@ -111,8 +116,8 @@ query.addLoad(Boat.ACTIVITY_CALENDAR); - if (log.isDebugEnabled()) { - log.debug("Query : " + query); + if (logger.isDebugEnabled()) { + logger.debug("Query : " + query); } return dao.findAllMappedByQuery(query, @@ -363,8 +368,8 @@ while(reader.readRecord()) { result[0]++; - if (log.isTraceEnabled()) { - log.trace(" " + Arrays.asList(reader.getValues())); + if (logger.isTraceEnabled()) { + logger.trace(" " + Arrays.asList(reader.getValues())); } String imma = ImportHelper.read(reader, BOAT.NAVS_COD); @@ -395,8 +400,8 @@ String activeStr = ImportHelper.read(reader, BOAT.NAVS_ACTIVE); boolean active = !activeStr.equals(BOAT.getBoatInactiveCode()); - if (log.isTraceEnabled()) { - log.trace("Active : " + active + " (" + activeStr + ")"); + if (logger.isTraceEnabled()) { + logger.trace("Active : " + active + " (" + activeStr + ")"); } // Find existing boat with immatriculation @@ -438,7 +443,7 @@ transaction.commitTransaction(); tic = ImportHelper.logTimeAndMemory( - log, tic, "navires ligne " + result[0]); + logger, tic, "navires ligne " + result[0]); } } @@ -483,16 +488,16 @@ // Reset limit : no pagination needed for results query.resetLimit(); - if (log.isDebugEnabled()) { - log.debug("Exec query : " + query); + if (logger.isDebugEnabled()) { + logger.debug("Exec query : " + query); } List<Boat> boats = dao.findAllByQuery(query); for (Boat boat : boats) { export.newRecord(); - if (log.isTraceEnabled()) { - log.trace("add boat : " + boat.getName() + " (" + + if (logger.isTraceEnabled()) { + logger.trace("add boat : " + boat.getName() + " (" + boat.getImmatriculation() + ")"); } @@ -587,16 +592,16 @@ } } - // Log ActivityCalendar access only for non admin user + // Log ActivityCalendar access only for no admin user if (!user.isAdmin()) { - Company company = user.getCompany(); - // FIXME-FD20100401 Find a way to avoid using old context for - // logging access on ActivityCalendar - WaoUtils.addActivityCalendarAccessLog( - "Calendrier " + result.getYear() + " du navire " + - boat.getName() + " (" + boat.getImmatriculation() + ") vu " + - "par " + user.getFullName() + " de la société " + - company.getName()); + StringBuilder builder = new StringBuilder("Calendrier "). + append(result.getYear()).append(" du navire "). + append(boat.getName()).append(" ("). + append(boat.getImmatriculation()).append(") vu par "). + append(user.getFullName()).append(" de la société "). + append(user.getCompany().getName()); + + context.getActivityCalendarAccessLogger().info(builder.toString()); } return result; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-15 10:24:24 UTC (rev 449) @@ -349,8 +349,6 @@ Company company = user.getCompany(); // For an admin, get the company from database if (user.isAdmin()) { - // FIXME-FD20100104 findContains not optimized in TopiaDAOImpl - //company = companyDAO.findContainsWaoUser(observer); company = observer.getCompany(); // For a user, check if the observer as the same company as the current user } else if (!observer.getCompany().equals(company)) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-15 10:24:24 UTC (rev 449) @@ -271,19 +271,6 @@ } } -// protected void updateFishingZones(TopiaContext transaction, String zoneId, SampleRow row, boolean delete) throws TopiaException { -// // FIXME find a way to avoid saving links from FishingZone instead of SampleRow : -// // variable inverse="true" in hibernate mapping of FishingZone, how to set this variable to SampleRow instead -// FishingZoneDAO fishingZoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); -// FishingZone zoneFromDB = fishingZoneDAO.findByTopiaId(zoneId); -// if (delete) { -// zoneFromDB.removeSampleRow(row); -// } else { -// zoneFromDB.addSampleRow(row); -// } -// fishingZoneDAO.update(zoneFromDB); -// } - @Override public FacadeRow executeGetSampleRowsOrderedByFishingZone( TopiaContext transaction, Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> <id length="255" name="topiaId" node="@topiaId" type="string"/> Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 10:24:24 UTC (rev 449) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">  - -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> <id length="255" name="topiaId" node="@topiaId" type="string"/>

1 0

[Suiviobsmer-commits] r448 - in trunk: . src src/announcement src/license src/site src/site/resources src/site/resources/admin src/site/resources/coordinator src/site/resources/doc src/site/resources/schemas src/site/resources/user src/site/rst src/site/rst/admin src/site/rst/coordinator src/site/rst/import src/site/rst/user wao-business wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-
by fdesbois＠users.labs.libre-entreprise.org April 15, 2010

April 15, 2010

Author: fdesbois Date: 2010-04-15 09:17:48 +0000 (Thu, 15 Apr 2010) New Revision: 448 Log: clean code + use last mavenpom version 2.1 + clean license headers Added: trunk/src/license/ trunk/src/license/project.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Removed: trunk/wao-business/src/main/java/fr/ifremer/wao/PgMigrationCallback.java trunk/wao-ui/src/main/webapp/WEB-INF/app_en.properties trunk/wao-ui/src/main/webapp/WEB-INF/app_fr.properties trunk/wao-ui/src/main/webapp/tmp/ Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/checkstyle.xml trunk/pom.xml trunk/src/announcement/release-email-1.0.3.txt trunk/src/announcement/release-email-1.1.1.txt trunk/src/announcement/release-email-1.1.txt trunk/src/site/resources/admin/actions.png trunk/src/site/resources/admin/change_pwd.png trunk/src/site/resources/admin/create_sampling_plan.png trunk/src/site/resources/admin/create_user.png trunk/src/site/resources/admin/create_user_2.png trunk/src/site/resources/admin/creationDepeche.png trunk/src/site/resources/admin/depeche.png trunk/src/site/resources/admin/export_contacts.png trunk/src/site/resources/admin/general_actions.png trunk/src/site/resources/admin/historical_sampling_plan.png trunk/src/site/resources/admin/import_boats.png trunk/src/site/resources/admin/import_boats_success.png trunk/src/site/resources/admin/import_contacts_success.png trunk/src/site/resources/admin/import_sampling_plan.png trunk/src/site/resources/admin/import_sampling_plan_success.png trunk/src/site/resources/admin/import_zones.png trunk/src/site/resources/admin/import_zones_success.png trunk/src/site/resources/admin/importing_calendar.png trunk/src/site/resources/admin/listeNavires.png trunk/src/site/resources/admin/login.png trunk/src/site/resources/admin/modif_sampling_plan.png trunk/src/site/resources/admin/recup_pwd.png trunk/src/site/resources/admin/synthese.png trunk/src/site/resources/admin/users.png trunk/src/site/resources/admin/validate_contacts.png trunk/src/site/resources/coordinator/comment_sampling_plan.png trunk/src/site/resources/doc/DOC_Contacts_Header.ods trunk/src/site/resources/doc/wao-contacts-import.csv trunk/src/site/resources/logo-obsmer.jpg trunk/src/site/resources/logo-wao.png trunk/src/site/resources/schemas/CU_WAO.png trunk/src/site/resources/schemas/Modele_WAO.png trunk/src/site/resources/user/account.png trunk/src/site/resources/user/actions.png trunk/src/site/resources/user/boats_contact.png trunk/src/site/resources/user/boats_edit.png trunk/src/site/resources/user/contacts_modification.png trunk/src/site/resources/user/contacts_validation.png trunk/src/site/resources/user/contacts_verification.png trunk/src/site/resources/user/login.png trunk/src/site/resources/user/login_failed.png trunk/src/site/resources/user/news.png trunk/src/site/resources/user/sampling_plan.png trunk/src/site/resources/user/syntheses.png trunk/src/site/rst/admin/boats.rst trunk/src/site/rst/admin/contacts.rst trunk/src/site/rst/admin/echantillonage.rst trunk/src/site/rst/admin/firstlaunch.rst trunk/src/site/rst/admin/news.rst trunk/src/site/rst/admin/syntheses.rst trunk/src/site/rst/admin/users.rst trunk/src/site/rst/business-rules.rst trunk/src/site/rst/coordinator.rst trunk/src/site/rst/coordinator/boats.rst trunk/src/site/rst/coordinator/contacts.rst trunk/src/site/rst/coordinator/echantillonage.rst trunk/src/site/rst/coordinator/syntheses.rst trunk/src/site/rst/import/boats.rst trunk/src/site/rst/import/contacts.rst trunk/src/site/rst/import/samplingPlan.rst trunk/src/site/rst/index.rst trunk/src/site/rst/installation.rst trunk/src/site/rst/model.rst trunk/src/site/rst/observer.rst trunk/src/site/rst/usecases.rst trunk/src/site/rst/user.rst trunk/src/site/rst/user/account.rst trunk/src/site/rst/user/authentication.rst trunk/src/site/rst/user/boats.rst trunk/src/site/rst/user/contacts.rst trunk/src/site/rst/user/createAContact.rst trunk/src/site/rst/user/echantillonage.rst trunk/src/site/rst/user/news.rst trunk/src/site/rst/user/syntheses.rst trunk/src/site/site_fr.xml trunk/wao-business/LICENSE.txt trunk/wao-business/README.txt trunk/wao-business/changelog.txt trunk/wao-business/nbactions.xml trunk/wao-business/pom.xml trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/sql/indexes.sql trunk/wao-business/src/main/xmi/wao.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/site/rst/index.rst trunk/wao-business/src/site/site_fr.xml trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java trunk/wao-business/src/test/resources/WaoTest.properties trunk/wao-business/src/test/resources/import/activity.csv trunk/wao-business/src/test/resources/import/activity.csv.gz trunk/wao-business/src/test/resources/import/contacts.csv trunk/wao-business/src/test/resources/import/dates.csv trunk/wao-business/src/test/resources/import/echantillonnage.csv trunk/wao-business/src/test/resources/import/misc.csv trunk/wao-business/src/test/resources/import/navires.csv trunk/wao-business/src/test/resources/import/zonesPeche.csv trunk/wao-business/src/test/resources/log4j.properties trunk/wao-ui/LICENSE.txt trunk/wao-ui/README.txt trunk/wao-ui/changelog.txt trunk/wao-ui/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SubmitContext.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties trunk/wao-ui/src/main/resources/log4j.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties trunk/wao-ui/src/main/webapp/Administration.tml trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/ExceptionReport.tml trunk/wao-ui/src/main/webapp/Index.tml trunk/wao-ui/src/main/webapp/SampleRowForm.tml trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml trunk/wao-ui/src/main/webapp/UserProfile.tml trunk/wao-ui/src/main/webapp/WEB-INF/app.properties trunk/wao-ui/src/main/webapp/WEB-INF/web.xml trunk/wao-ui/src/main/webapp/css/administration.css trunk/wao-ui/src/main/webapp/css/boats.css trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/contacts.css trunk/wao-ui/src/main/webapp/css/main.css trunk/wao-ui/src/main/webapp/css/news.css trunk/wao-ui/src/main/webapp/css/sampling.css trunk/wao-ui/src/main/webapp/css/synthesis.css trunk/wao-ui/src/main/webapp/css/userProfile.css trunk/wao-ui/src/main/webapp/favicon.png trunk/wao-ui/src/main/webapp/img/MiniLogo.jpg trunk/wao-ui/src/main/webapp/img/accept-22px.png trunk/wao-ui/src/main/webapp/img/accept-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/accept.png trunk/wao-ui/src/main/webapp/img/add-32px.png trunk/wao-ui/src/main/webapp/img/add.png trunk/wao-ui/src/main/webapp/img/background.jpg trunk/wao-ui/src/main/webapp/img/boat-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/boat.png trunk/wao-ui/src/main/webapp/img/boat_old.png trunk/wao-ui/src/main/webapp/img/calendar-unavailable.png trunk/wao-ui/src/main/webapp/img/calendar.png trunk/wao-ui/src/main/webapp/img/chart-area.png trunk/wao-ui/src/main/webapp/img/chart-bar.png trunk/wao-ui/src/main/webapp/img/chart-line.png trunk/wao-ui/src/main/webapp/img/clock-22px.png trunk/wao-ui/src/main/webapp/img/clock.png trunk/wao-ui/src/main/webapp/img/comment-22px.png trunk/wao-ui/src/main/webapp/img/comment-invalid-22px.png trunk/wao-ui/src/main/webapp/img/comment-valid-22px.png trunk/wao-ui/src/main/webapp/img/contact-22px.png trunk/wao-ui/src/main/webapp/img/contact-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/contact1-22px.png trunk/wao-ui/src/main/webapp/img/contact1-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/contacts-full.png trunk/wao-ui/src/main/webapp/img/contacts-reduce.png trunk/wao-ui/src/main/webapp/img/contacts-termines.png trunk/wao-ui/src/main/webapp/img/contacts-valides.png trunk/wao-ui/src/main/webapp/img/delete-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/delete.png trunk/wao-ui/src/main/webapp/img/delete2.png trunk/wao-ui/src/main/webapp/img/dolphin-22px.png trunk/wao-ui/src/main/webapp/img/downarrow.png trunk/wao-ui/src/main/webapp/img/edit-32px.png trunk/wao-ui/src/main/webapp/img/edit-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/edit.png trunk/wao-ui/src/main/webapp/img/edit1-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/edit1.png trunk/wao-ui/src/main/webapp/img/empty-22px.png trunk/wao-ui/src/main/webapp/img/empty.png trunk/wao-ui/src/main/webapp/img/exit.png trunk/wao-ui/src/main/webapp/img/eye-22px.png trunk/wao-ui/src/main/webapp/img/false-22px.png trunk/wao-ui/src/main/webapp/img/file-export-22px.png trunk/wao-ui/src/main/webapp/img/file-import-22px.png trunk/wao-ui/src/main/webapp/img/file-import1-22px.png trunk/wao-ui/src/main/webapp/img/fishing-net-22px.png trunk/wao-ui/src/main/webapp/img/go-home.png trunk/wao-ui/src/main/webapp/img/help-22px.png trunk/wao-ui/src/main/webapp/img/help-22px_old.png trunk/wao-ui/src/main/webapp/img/home.png trunk/wao-ui/src/main/webapp/img/logo-gplv3.png trunk/wao-ui/src/main/webapp/img/logo-wao-48px.png trunk/wao-ui/src/main/webapp/img/logo-wao-48px_old.png trunk/wao-ui/src/main/webapp/img/logo_WAO.png trunk/wao-ui/src/main/webapp/img/preferences.png trunk/wao-ui/src/main/webapp/img/refresh-22px.png trunk/wao-ui/src/main/webapp/img/refuse-22px.png trunk/wao-ui/src/main/webapp/img/refuse-unavailable-22px.png trunk/wao-ui/src/main/webapp/img/remove-22px.png trunk/wao-ui/src/main/webapp/img/sample-table.png trunk/wao-ui/src/main/webapp/img/sampling.png trunk/wao-ui/src/main/webapp/img/samplingPlan-full.png trunk/wao-ui/src/main/webapp/img/samplingPlan-reduce.png trunk/wao-ui/src/main/webapp/img/save-22px.png trunk/wao-ui/src/main/webapp/img/save.png trunk/wao-ui/src/main/webapp/img/search-32px.png trunk/wao-ui/src/main/webapp/img/search.png trunk/wao-ui/src/main/webapp/img/source/contacts-full.xcf trunk/wao-ui/src/main/webapp/img/source/contacts-reduce.xcf trunk/wao-ui/src/main/webapp/img/source/contacts-table.png trunk/wao-ui/src/main/webapp/img/source/contacts-termines.xcf trunk/wao-ui/src/main/webapp/img/source/contacts-valides.xcf trunk/wao-ui/src/main/webapp/img/source/samplingPlan-full.xcf trunk/wao-ui/src/main/webapp/img/source/samplingPlan-reduce.xcf trunk/wao-ui/src/main/webapp/img/suppr-16px.png trunk/wao-ui/src/main/webapp/img/suppr-unavailable-16px.png trunk/wao-ui/src/main/webapp/img/synthesis-graph-boarding.png trunk/wao-ui/src/main/webapp/img/synthesis-graph-sampling.png trunk/wao-ui/src/main/webapp/img/synthesis-ind-allegro-reactivity.png trunk/wao-ui/src/main/webapp/img/synthesis-ind-contact-states.png trunk/wao-ui/src/main/webapp/img/synthesis-ind-non-compliance-boarding.png trunk/wao-ui/src/main/webapp/img/text-32px.png trunk/wao-ui/src/main/webapp/img/text-access-32px.png trunk/wao-ui/src/main/webapp/img/true-22px.png trunk/wao-ui/src/main/webapp/img/undo-22px.png trunk/wao-ui/src/main/webapp/img/undo.png trunk/wao-ui/src/main/webapp/img/uparrow.png trunk/wao-ui/src/main/webapp/img/user-22px.png trunk/wao-ui/src/main/webapp/img/user.png trunk/wao-ui/src/main/webapp/js/FCKConf.js trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js trunk/wao-ui/src/main/webapp/js/dialog.js trunk/wao-ui/src/main/webapp/js/wao.js trunk/wao-ui/src/site/rst/index.rst trunk/wao-ui/src/site/site_fr.xml trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java trunk/wao-ui/src/test/resources/log4j.properties Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/changelog.txt 2010-04-15 09:17:48 UTC (rev 448) @@ -29,11 +29,10 @@ Dépendances +++++++++++ +- **mavenpom4labs** 2.0.7 -> 2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] - **Nuiton-utils** 1.2.1 -> 1.2.2 [http://maven-site.nuiton.org/nuiton-utils] - **EUGene** 2.0 -> 2.0.1 [http://maven-site.nuiton.org/eugene] - **ToPIA** 2.3.2.1 -> 2.3.3 [http://maven-site.nuiton.org/topia] -- **mavenpom4labs** 2.0.7 -> 2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] - TODO 1.1.1 (patch) ------------- Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/checkstyle.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/pom.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.7</version> + <version>2.1</version> </parent> <groupId>fr.ifremer</groupId> @@ -302,6 +302,11 @@ </build> +  + <reporting> + <excludeDefaults>true</excludeDefaults> + </reporting> +    Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.0.3.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.1.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/announcement/release-email-1.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml (rev 0) +++ trunk/src/license/project.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -0,0 +1,105 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-…"> + <mainLicense>gpl_v3</mainLicense> + + <headers> + + <header> + <commentStyle>java</commentStyle> + <fileSets> + <fileSet> + <basedir>src/main/java</basedir> + <include>**/*.java</include> + </fileSet> + <fileSet> +  + <basedir>src/main/webapp</basedir> + <includes> + <include>**/*.css</include> + <include>**/*.js</include> + </includes> + </fileSet> + <fileSet> +  + <basedir>src/test/java</basedir> + <include>**/*.java</include> + </fileSet> + <fileSet> +  + <basedir>target/generated-sources/java</basedir> + <include>**/*.java</include> + </fileSet> + </fileSets> + </header> + + <header> + <commentStyle>rst</commentStyle> + <fileSet> +  + <basedir>src/site</basedir> + <include>**/*.rst</include> + </fileSet> + </header> + + <header> + <commentStyle>xml</commentStyle> + <fileSets> + <fileSet> +  + <basedir>src/main/webapp</basedir> + <includes> + <include>**/*.tml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet> +  + <basedir>src/main/resources</basedir> + <includes> + <include>**/*.tml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet> +  + <basedir>src/test/java</basedir> + <include>**/*.tml</include> + </fileSet> + <fileSet> +  + <basedir>src/site</basedir> + <include>**/*.xml</include> + </fileSet> + <fileSet> +  + <basedir>target/generated-sources/java</basedir> + <include>**/*.xml</include> + </fileSet> + </fileSets> + </header> + + <header> + <commentStyle>properties</commentStyle> + <fileSets> + <fileSet> +  + <basedir>src/main/resources</basedir> + <include>**/*.properties</include> + </fileSet> + <fileSet> +  + <basedir>src/main/webapp</basedir> + <include>**/*.properties</include> + </fileSet> + <fileSet> +  + <basedir>src/main/filters</basedir> + <include>**/*.properties</include> + </fileSet> + </fileSets> + </header> + </headers> + +</project> Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Property changes on: trunk/src/site/resources/admin/actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/change_pwd.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/create_sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/create_user.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/create_user_2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/creationDepeche.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/depeche.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/export_contacts.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/general_actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/historical_sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_boats.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_boats_success.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_contacts_success.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_sampling_plan_success.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_zones.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/import_zones_success.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/importing_calendar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/listeNavires.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/login.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/modif_sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/recup_pwd.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/synthese.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/users.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/admin/validate_contacts.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/coordinator/comment_sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/doc/DOC_Contacts_Header.ods ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/doc/wao-contacts-import.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/logo-obsmer.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/logo-wao.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/CU_WAO.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/schemas/Modele_WAO.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/account.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/actions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/boats_contact.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/boats_edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/contacts_modification.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/contacts_validation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/contacts_verification.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/login.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/login_failed.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/news.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/sampling_plan.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/user/syntheses.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/boats.rst =================================================================== --- trunk/src/site/rst/admin/boats.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/boats.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Créer/Gérer la base des navires =============================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Pour gérer la base des navires, il faut se rendre sur l'onglet Navires. A partir de cet onglet, il est possible de charger la liste des navires depuis un fichier csv ou les calendriers d'activité depuis un fichier csv ou un fichier Property changes on: trunk/src/site/rst/admin/boats.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/contacts.rst =================================================================== --- trunk/src/site/rst/admin/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/contacts.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,8 +1,36 @@ Les contacts ------------- +============ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Importer les contacts -===================== +--------------------- Cliquez sur le lien import/export pour afficher le formulaire approprié. Sélectionnez le fichier à importer et @@ -18,7 +46,7 @@ :width: 800px Exporter les contacts -===================== +--------------------- Cliquez sur le lien import/export pour afficher le formulaire approprié. Cliquez sur la flèche vers le haut pour @@ -27,7 +55,7 @@ .. image:: export_contacts.png Valider des contacts -==================== +-------------------- Pour chaque contact effectué, la société doit le valider de même que l'administrateur afin quil soit pris en compte dans le plan d'échantillonage. @@ -43,7 +71,7 @@ :width: 800px Réduire la vue -============== +-------------- Pour réduire la vue (n'afficher que les informations les plus pertinentes), cliquez sur le lien correspondant. Vous pouvez revenir à la vue normale en Property changes on: trunk/src/site/rst/admin/contacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/echantillonage.rst =================================================================== --- trunk/src/site/rst/admin/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/echantillonage.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,8 +1,36 @@ Le plan d'échantillonage ------------------------- +======================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Importer le plan d'échantillonage -================================= +--------------------------------- Pour importer le plan d'échantillonage, il suffit de sélectionner le fichier à importer et valider. @@ -21,7 +49,7 @@ :width: 800px Gérer le plan d'échantillonage -============================== +------------------------------ Vous pouvez afficher le plan d'échantillonage sur une période de temps donnée grace aux filtres situés au dessus du plan. Vous pouvez accéder aux filtres Property changes on: trunk/src/site/rst/admin/echantillonage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/firstlaunch.rst =================================================================== --- trunk/src/site/rst/admin/firstlaunch.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/firstlaunch.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Premier lancement ================= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Connection ---------- Property changes on: trunk/src/site/rst/admin/firstlaunch.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/news.rst =================================================================== --- trunk/src/site/rst/admin/news.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/news.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Gérer la page d'accueil ======================= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Quand un administrateur s'est authentifié, il arrive sur la page d'accueil, qui par défaut est vide. Cette page d'accueil est remplie de dépèches par l'administrateur et visible par tous les utilisateurs. Property changes on: trunk/src/site/rst/admin/news.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/syntheses.rst =================================================================== --- trunk/src/site/rst/admin/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/syntheses.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Les synthèses -------------- +============= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs tels que : Property changes on: trunk/src/site/rst/admin/syntheses.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/admin/users.rst =================================================================== --- trunk/src/site/rst/admin/users.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/admin/users.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Gérer les sociétés et les utilisateurs ====================================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Pour gérer les sociétés et les utilisateurs, il faut se rendre sur la page d'administration. @@ -56,7 +84,7 @@ le mot de passe est envoyé par e-mail à l'utilisateur (grace à son identifiant de connection). Si l'identifiant de connection n'est pas un e-mail, il est préférable de rentrer le mot de passe à la main et de le transmettre oralement à -l'utilsiateur. +l'utilisateur. Les roles $$$$$$$$$ Property changes on: trunk/src/site/rst/admin/users.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/business-rules.rst =================================================================== --- trunk/src/site/rst/business-rules.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/business-rules.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Documentation des règles métiers de l'application WAO ===================================================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Ligne du plan d'échantillonnage (ADMIN) --------------------------------------- Property changes on: trunk/src/site/rst/business-rules.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/boats.rst =================================================================== --- trunk/src/site/rst/coordinator/boats.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/coordinator/boats.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Les navires =========== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran des navires est le même pour un observateur et un coordinateur. Veuillez vous référer à la `documentation observateur`_ pour plus d'informations. Property changes on: trunk/src/site/rst/coordinator/boats.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/contacts.rst =================================================================== --- trunk/src/site/rst/coordinator/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/coordinator/contacts.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Gérer les contacts ================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + La page des contacts reprends tous les contacts de la société. Il est possible de modifier un contact pour mettre à jour son statut et les informations qui lui sont associées et valider un embarquement. Property changes on: trunk/src/site/rst/coordinator/contacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Le plan d'échantillonage ======================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran du plan d'échantillonage vous permet de visualiser rapidement le plan d'échantillonage, son avancement et les embarquements à réaliser. Property changes on: trunk/src/site/rst/coordinator/echantillonage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator/syntheses.rst =================================================================== --- trunk/src/site/rst/coordinator/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/coordinator/syntheses.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Les synthèses -------------- +============= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs tels que : Property changes on: trunk/src/site/rst/coordinator/syntheses.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/coordinator.rst =================================================================== --- trunk/src/site/rst/coordinator.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/coordinator.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Coordinateurs -------------- +============= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette documentation regroupe les actions disponibles pour les utilisateurs ayant le rôle 'coordinateur' : Property changes on: trunk/src/site/rst/coordinator.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/import/boats.rst =================================================================== --- trunk/src/site/rst/import/boats.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/import/boats.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Import des navires ================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette fonctionnalité est disponible depuis la page des **Navires** en mode administrateur. Infos @@ -27,4 +55,4 @@ - QUARTIER_IMMA : Code lieu d'immatriculation - PER_COD : Code armateur (identifiant unique) (NA = pas d'armateur) - PER_NOM : Nom de l'armateur -- PER_PRENOM : Prénom de l'armateur \ No newline at end of file +- PER_PRENOM : Prénom de l'armateur Property changes on: trunk/src/site/rst/import/boats.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/import/contacts.rst =================================================================== --- trunk/src/site/rst/import/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/import/contacts.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Import/Export des Contacts ========================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette fonctionnalité est disponible depuis la page des **Contacts**. Infos Property changes on: trunk/src/site/rst/import/contacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/import/samplingPlan.rst =================================================================== --- trunk/src/site/rst/import/samplingPlan.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/import/samplingPlan.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Documentation Import du plan d'échantillonnage ============================================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette fonctionnalité est disponible depuis la page du **Plan d'échantillonnage** en mode administrateur. Infos Property changes on: trunk/src/site/rst/import/samplingPlan.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/index.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ Accueil ======= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Application permettant le suivi des embarquements effectués sur des navires de pêche dans le cadre d'observations scientifiques. Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/installation.rst =================================================================== --- trunk/src/site/rst/installation.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/installation.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,36 @@ Installation ============ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + +Mode d'emploi pour l'installation de WAO + Deux possibilités ----------------- @@ -108,7 +138,7 @@ Le plus simple pour tomcat est de définir dans /etc/default un fichier *tomcat* contenant :: -JAVA_OPTS="$JAVA_OPTS -Dwao.log.home=/var/log/wao -Dwao.config.path=/var/local/wao" + JAVA_OPTS="$JAVA_OPTS -Dwao.log.home=/var/log/wao -Dwao.config.path=/var/local/wao" Références ---------- @@ -126,4 +156,4 @@ .. _ApplicationConfig: http://maven-site.nuiton.org/nuiton-utils -.. _Log4j: http://logging.apache.org/log4j/1.2/index.html \ No newline at end of file +.. _Log4j: http://logging.apache.org/log4j/1.2/index.html Property changes on: trunk/src/site/rst/installation.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/model.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -5,6 +5,34 @@ :Revision: $Revision$ :Date: $Date$ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Le modèle de l'application WAO est composé de quatres grandes parties : - `Plan d'echantillonnage`_ (couleur verte) : Comprend l'effort d'observations @@ -237,4 +265,4 @@ ~~~~~~~~~~~ - [BoatInfos] Ajout des champs : contactAddress1, contactAddress2, - contactPostalCode, contactCity et contactSiret. \ No newline at end of file + contactPostalCode, contactCity et contactSiret. Property changes on: trunk/src/site/rst/model.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/observer.rst =================================================================== --- trunk/src/site/rst/observer.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/observer.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Observateurs ------------- +============ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette documentation regroupe les actions disponibles pour les utilisateurs ayant le rôle 'observateur' : Property changes on: trunk/src/site/rst/observer.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/usecases.rst =================================================================== --- trunk/src/site/rst/usecases.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/usecases.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -5,6 +5,34 @@ :Revision: $Revision$ :Date: $Date$ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Il existe plusieurs types d'utilisateur dans l'application WAO : - `Utilisateur lecture seule`_ : Personne n'ayant qu'un droit de lecture @@ -178,4 +206,4 @@ .. _Gerer ligne du plan d echantillonnage: admin/echantillonage.html#Grer_le_plan_dchantillonage -.. _Gerer news: admin/news.html \ No newline at end of file +.. _Gerer news: admin/news.html Property changes on: trunk/src/site/rst/usecases.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/account.rst =================================================================== --- trunk/src/site/rst/user/account.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/account.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Le compte utilisateur ===================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Dans WAO, le compte utilisateur est simple, il comprend les noms, prénoms, login (addresse mail), numéro de téléphone et mot de passe. Ces informations sont modifiables en cliquant sur l'icone 'profil' (le personnage) situé en haut à @@ -9,4 +37,4 @@ .. image:: account.png Il est conseillé de laisser un identifiant de connection qui soit un email pour -pouvoir récupérer son mot de passe en cas d'oubli. \ No newline at end of file +pouvoir récupérer son mot de passe en cas d'oubli. Property changes on: trunk/src/site/rst/user/account.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/authentication.rst =================================================================== --- trunk/src/site/rst/user/authentication.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/authentication.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Se connecter ============ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Pour se connecter à l'application, il faut renseigner son identifiant et son mot de passe et valider. @@ -16,4 +44,4 @@ ============== Pour se déconnecter, il suffit de cliquer sur l'icone 'deconnection' situé en -haut à droite de l'écran. \ No newline at end of file +haut à droite de l'écran. Property changes on: trunk/src/site/rst/user/authentication.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/boats.rst =================================================================== --- trunk/src/site/rst/user/boats.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/boats.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Les navires =========== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Vous pouvez atteindre la page des navitres soient en venant depuis le plan d'échantillonage, soit depuis le menu. Cette page affiche tous les navires disponibles (tous lorsque l'on vient du menu ou ceux correspondant à une ligne Property changes on: trunk/src/site/rst/user/boats.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/contacts.rst =================================================================== --- trunk/src/site/rst/user/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/contacts.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Gérer les contacts ================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + La page des contacts reprends tous les contacts de la société. Il est possible de modifier un contact pour mettre à jour son statut et les informations qui lui sont associées. Property changes on: trunk/src/site/rst/user/contacts.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/createAContact.rst =================================================================== --- trunk/src/site/rst/user/createAContact.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/createAContact.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Comment créer un contact ? ========================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + 1. Choisir la ligne du plan d'échantillonage concernée ------------------------------------------------------ @@ -39,4 +67,4 @@ .. image:: boats_contact.png :width: 800px -.. _documentation: contacts.html \ No newline at end of file +.. _documentation: contacts.html Property changes on: trunk/src/site/rst/user/createAContact.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/echantillonage.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Le plan d'échantillonage ======================== +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran du plan d'échantillonage vous permet de visualiser rapidement le plan d'échantillonage, son avancement et les embarquements à réaliser. Property changes on: trunk/src/site/rst/user/echantillonage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/news.rst =================================================================== --- trunk/src/site/rst/user/news.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/news.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ L'écran d'accueil ================= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran d'accueil regroupe différentes nouvelles rédigées par les administrateurs a destination des utilisateurs. Il est possible de retourner à l'écran d'accueil en cliquant sur l'icone 'maison' en haut à droite de l'écran. Property changes on: trunk/src/site/rst/user/news.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user/syntheses.rst =================================================================== --- trunk/src/site/rst/user/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user/syntheses.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Les synthèses -------------- +============= +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs tels que : @@ -12,4 +40,3 @@ .. image:: syntheses.png :width: 800px - Property changes on: trunk/src/site/rst/user/syntheses.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/rst/user.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,6 +1,34 @@ Utilisateurs ------------- +============ +.. - +.. * #%L +.. * Wao +.. * .. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + Cette documentation regroupe toutes les actions communes à tous les utilisateurs : Property changes on: trunk/src/site/rst/user.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/src/site/site_fr.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/nbactions.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Business +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### ## Default properties for H2 database hibernate.hbm2ddl.auto=none hibernate.show_sql=false Property changes on: trunk/wao-business/src/main/filters/Wao.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-business/src/main/java/fr/ifremer/wao/PgMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PgMigrationCallback.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PgMigrationCallback.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,82 +0,0 @@ -/* - * *##% - * Wao :: Business - * Copyright (C) 2009 - 2010 Ifremer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* - */ - -package fr.ifremer.wao; - -import fr.ifremer.wao.bean.ContactState; -import java.util.List; - -/** - * PgMigrationCallback - * - * Created: 24 mars 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class PgMigrationCallback extends WaoMigrationCallBack { - - @Override - protected void createUserRoleColumn_1_1a(List<String> queries) { - // Evo #2063 - queries.add("ALTER TABLE WaoUser ADD role SMALLINT;"); - queries.add("UPDATE WaoUser SET role = 0 WHERE admin = TRUE;"); - queries.add("UPDATE WaoUser SET role = 1 WHERE admin = FALSE;"); - queries.add("ALTER TABLE WaoUser DROP COLUMN admin;"); - // Evo #1980 - queries.add("ALTER TABLE WaoUser ADD readOnly BOOLEAN;"); - // need to initialize readOnly, the entity property has the primitive - // type boolean - queries.add("UPDATE WaoUser SET readOnly = FALSE;"); - } - - @Override - protected void changeContactStateColumn_1_1b(List<String> queries) { - queries.add("ALTER TABLE Contact ADD state1 SMALLINT;"); - for (ContactState state : ContactState.values()) { - queries.add("UPDATE Contact SET state1 = " + state.ordinal() + - " WHERE state = '" + state.libelle() + "'"); - } - queries.add("ALTER TABLE Contact DROP COLUMN state;"); - queries.add("ALTER TABLE Contact RENAME state1 TO state;"); - } - - @Override - protected void changeSampleRowLogAdminColumn_1_1c(List<String> queries) { - // Evo #1960 : change column name admin to author for sampleRowLog - queries.add("ALTER TABLE SampleRowLog RENAME admin TO author;"); - } - - @Override - protected void createBoatInfosNewColumns_1_2(List<String> queries) { - // Evo #2060 : add new columns in BoatInfos (contactSiret, - // contactAddress1, contactAddress2, contactCity, contactPostalCode) - queries.add("ALTER TABLE BoatInfos ADD contactAddress1 TEXT;"); - queries.add("ALTER TABLE BoatInfos ADD contactAddress2 TEXT;"); - queries.add("ALTER TABLE BoatInfos ADD contactCity TEXT;"); - queries.add("ALTER TABLE BoatInfos ADD contactPostalCode INTEGER;"); - queries.add("ALTER TABLE BoatInfos ADD contactSiret TEXT;"); - } - -} Copied: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java (from rev 437, trunk/wao-business/src/main/java/fr/ifremer/wao/PgMigrationCallback.java) =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-15 09:17:48 UTC (rev 448) @@ -0,0 +1,85 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.wao; + +import fr.ifremer.wao.bean.ContactState; +import java.util.List; + +/** + * PgMigrationCallback + * + * Created: 24 mars 2010 + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public class PostgresMigrationCallback extends WaoMigrationCallBack { + + @Override + protected void createUserRoleColumn_1_1a(List<String> queries) { + // Evo #2063 + queries.add("ALTER TABLE WaoUser ADD role SMALLINT;"); + queries.add("UPDATE WaoUser SET role = 0 WHERE admin = TRUE;"); + queries.add("UPDATE WaoUser SET role = 1 WHERE admin = FALSE;"); + queries.add("ALTER TABLE WaoUser DROP COLUMN admin;"); + // Evo #1980 + queries.add("ALTER TABLE WaoUser ADD readOnly BOOLEAN;"); + // need to initialize readOnly, the entity property has the primitive + // type boolean + queries.add("UPDATE WaoUser SET readOnly = FALSE;"); + } + + @Override + protected void changeContactStateColumn_1_1b(List<String> queries) { + queries.add("ALTER TABLE Contact ADD state1 SMALLINT;"); + for (ContactState state : ContactState.values()) { + queries.add("UPDATE Contact SET state1 = " + state.ordinal() + + " WHERE state = '" + state.libelle() + "'"); + } + queries.add("ALTER TABLE Contact DROP COLUMN state;"); + queries.add("ALTER TABLE Contact RENAME state1 TO state;"); + } + + @Override + protected void changeSampleRowLogAdminColumn_1_1c(List<String> queries) { + // Evo #1960 : change column name admin to author for sampleRowLog + queries.add("ALTER TABLE SampleRowLog RENAME admin TO author;"); + } + + @Override + protected void createBoatInfosNewColumns_1_2(List<String> queries) { + // Evo #2060 : add new columns in BoatInfos (contactSiret, + // contactAddress1, contactAddress2, contactCity, contactPostalCode) + queries.add("ALTER TABLE BoatInfos ADD contactAddress1 TEXT;"); + queries.add("ALTER TABLE BoatInfos ADD contactAddress2 TEXT;"); + queries.add("ALTER TABLE BoatInfos ADD contactCity TEXT;"); + queries.add("ALTER TABLE BoatInfos ADD contactPostalCode INTEGER;"); + queries.add("ALTER TABLE BoatInfos ADD contactSiret TEXT;"); + } + +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -26,15 +33,12 @@ * * Created: 22 déc. 2009 * - * @param <T> - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoBusinessException extends Exception { + private static final long serialVersionUID = 1L; + protected Type type; protected Class<?> serviceClass; Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao; import fr.ifremer.wao.service.ServiceUser; @@ -9,7 +36,10 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.ApplicationConfig; - +/** + * + * @author fdesbois <fdesbois at codelutin.com> + */ public interface WaoContext { /** Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,30 +1,35 @@ -/** - * *##% +/* + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ - package fr.ifremer.wao; import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.service.ServiceUser; -import java.io.PrintStream; import java.nio.charset.Charset; import java.security.NoSuchAlgorithmException; import java.util.Date; @@ -56,18 +61,12 @@ * * Created on 2009-11-23 * - * @author fdesbois - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author: fdesbois $ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoContextImpl implements WaoContext { private static final Logger log = LoggerFactory.getLogger(WaoContextImpl.class); -// private static WaoRunner runner; - private boolean activityCalendarImport; private Date currentDate; @@ -78,15 +77,6 @@ private static final String APP_NAME = "wao"; -// private static org.apache.log4j.Logger activityCalendarAccessLogger; - -// public static void setRunner(WaoRunner run) { -// if (log.isDebugEnabled()) { -// log.debug("set runner in context"); -// } -// runner = run; -// } - @Override public Date getCurrentDate() { if (currentDate == null) { @@ -151,7 +141,7 @@ String callBackName = null; String dialect = conf.getOption("hibernate.dialect"); if (dialect.contains("PostgreSQL")) { - callBackName = PgMigrationCallback.class.getName(); + callBackName = PostgresMigrationCallback.class.getName(); } else if (dialect.contains("H2")) { // Unsupported yet callBackName = null; @@ -189,7 +179,6 @@ * * @param conf ApplicationConfig */ - //@Override public void loadConfiguration(ApplicationConfig conf) { configuration = conf; configuration.setOption("topia.persistence.classes", @@ -221,8 +210,6 @@ // Set context in PollenProperty enum to use easily method // getValue() on PollenProperty WaoProperty.setContext(this); - // temp -// WaoContextO.setContext(this); // Set context in utils static class for entities WaoUtils.setContext(this); @@ -282,6 +269,7 @@ return activityCalendarImport; } + // FIXME-FD20100415 : Uncomment this code : Ano #2246 // @Override // public void addActivityCalendarAccessLog(String message) throws IOException { // if (activityCalendarAccessLogger == null) { @@ -356,9 +344,6 @@ try { transaction.closeContext(); } catch (TopiaException eee) { -// if (log.isErrorEnabled()) { -// log.error(_("wao.error.context.close"), eee); -// } treateError(eee, n_("wao.error.context.close")); } } Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,29 +1,41 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ + package fr.ifremer.wao; +/** + * + * @author fdesbois <fdesbois at codelutin.com> + */ +public class WaoException extends RuntimeException { + private static final long serialVersionUID = 1L; -public class WaoException extends RuntimeException { - protected Object[] args; /** * WaoException : Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,31 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ + package fr.ifremer.wao; import java.util.ArrayList; @@ -29,8 +37,11 @@ import org.nuiton.util.Version; import java.util.List; -import org.nuiton.topia.TopiaContext; +/** + * + * @author fdesbois <fdesbois at codelutin.com> + */ public abstract class WaoMigrationCallBack extends ManualMigrationCallback { /** Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -26,11 +33,7 @@ * * Created: 31 mars 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public enum WaoProperty { /** Path for log on activityCalendar import **/ Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -39,11 +46,7 @@ * * Created: 1 avr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoUtils { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -31,11 +38,7 @@ * * Created: 2 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatFilterImpl extends BoatFilter { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -33,11 +40,7 @@ * * Created: 7 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class CompanyBoatInfosImpl extends CompanyBoatInfos { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -26,11 +33,7 @@ * * Created: 12 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactAverageReactivityImpl extends ContactAverageReactivity { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -24,7 +31,6 @@ import fr.ifremer.wao.entity.Contact; import java.util.ArrayList; import java.util.List; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaEntity; @@ -33,11 +39,7 @@ * * Created: 14 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactFilterImpl extends ContactFilter { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -31,11 +38,7 @@ * * Created: 3 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author: fdesbois $ + * @author fdesbois <fdesbois at codelutin.com> */ public enum ContactState { CONTACT_START("Contact pris", false, false), Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,27 +1,33 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; -import fr.ifremer.wao.entity.Company; import java.util.HashMap; import java.util.Map; @@ -30,11 +36,7 @@ * * Created: 5 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactStateStatisticsImpl extends ContactStateStatistics { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -26,18 +33,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.nuiton.util.PeriodDates; /** * FacadeRowImpl * * Created: 1 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class FacadeRowImpl extends FacadeRow { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -29,11 +36,7 @@ * * Created: 11 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ImportResultsImpl extends ImportResults { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -36,11 +43,7 @@ * * Created: 14 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SamplingFilterImpl extends SamplingFilter { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -28,11 +35,7 @@ * * Created: 18 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class UserFilterImpl extends UserFilter { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.bean; @@ -26,11 +33,7 @@ * * Created: 24 mars 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public enum UserRole { /** Admin role **/ Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -28,11 +35,7 @@ * * Created: 11 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ActivityCalendarImpl extends fr.ifremer.wao.entity.ActivityCalendarAbstract implements Serializable, fr.ifremer.wao.entity.ActivityCalendar { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,31 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ + package fr.ifremer.wao.entity; import java.io.Serializable; @@ -27,11 +35,7 @@ * * Created: 11 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ActivityMonthImpl extends ActivityMonthAbstract implements Serializable, ActivityMonth { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -28,11 +35,7 @@ * * Created: 11 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ActivityProfessionImpl extends ActivityProfessionAbstract implements Serializable, ActivityProfession { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -38,11 +45,7 @@ * * Created: 26 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatImpl extends BoatAbstract implements Serializable, Boat { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -37,11 +44,7 @@ * * Created: 25 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatInfosImpl extends BoatInfosAbstract implements Serializable, BoatInfos { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -31,11 +38,7 @@ * * Created: 27 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class CompanyImpl extends CompanyAbstract implements Serializable, Company { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,31 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ + package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.ContactState; @@ -33,11 +41,7 @@ * Created: 21 déc. 2009 * * @param <E> - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactDAOImpl<E extends Contact> extends ContactDAOAbstract<E> { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -33,11 +40,7 @@ * * Created: 18 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactImpl extends ContactAbstract implements Serializable, Contact { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,45 +1,44 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * FishingZoneImpl * * Created: 1 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class FishingZoneImpl extends FishingZoneAbstract implements Serializable, FishingZone { - private static final Logger log = LoggerFactory.getLogger(FishingZoneImpl.class); - private static final long serialVersionUID = 1L; @Override Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -31,11 +38,7 @@ * * Created: 1 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ProfessionImpl extends ProfessionAbstract implements Serializable, Profession { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -39,11 +46,7 @@ * * Created: 2 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SampleMonthImpl extends SampleMonthAbstract implements Serializable, SampleMonth { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -54,11 +61,7 @@ * * Created: 30 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SampleRowImpl extends SampleRowAbstract implements SampleRow, Serializable { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -31,16 +38,10 @@ * * Created: 12 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SampleRowLogImpl extends SampleRowLogAbstract implements SampleRowLog { - //private static final Logger log = LoggerFactory.getLogger(SampleRowLogImpl.class); - private static final long serialVersionUID = 1L; @Override Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -32,11 +39,7 @@ * * Created: 27 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoUserImpl extends WaoUserAbstract implements Serializable, WaoUser { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.io; @@ -50,11 +57,7 @@ * Created: 11 févr. 2010 * * @param <H> - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public abstract class ExportHelper<H extends IOHeader> { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.io; @@ -47,11 +54,7 @@ * * Created: 4 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ImportHelper { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.io; @@ -39,11 +46,7 @@ * * Created: 11 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SamplingExport extends ExportHelper<SamplingHeader> { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.io; @@ -32,11 +39,7 @@ * * Created: 11 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoCsvHeader { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -61,11 +68,7 @@ * * Created: 11 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ActivityCalendarImport implements Runnable { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -64,11 +71,7 @@ * * Created: 24 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceBoatImpl extends ServiceBoatAbstract { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,63 +1,35 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; -import com.csvreader.CsvReader; -import com.csvreader.CsvWriter; -import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.io.ImportHelper; -import fr.ifremer.wao.io.ImportHelper.*; -import fr.ifremer.wao.WaoBusinessException; -import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.WaoContext; -import fr.ifremer.wao.WaoDAOHelper; -import fr.ifremer.wao.bean.ContactState; import java.io.IOException; import java.io.InputStream; -import org.nuiton.topia.framework.TopiaQuery; -import fr.ifremer.wao.bean.ContactFilter; -import fr.ifremer.wao.bean.ImportResults; -import fr.ifremer.wao.bean.ImportResultsImpl; -import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.BoatDAO; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactDAO; -import fr.ifremer.wao.entity.ContactImpl; -import fr.ifremer.wao.entity.ElligibleBoat; -import fr.ifremer.wao.entity.ElligibleBoatDAO; -import fr.ifremer.wao.entity.FishingZone; -import fr.ifremer.wao.entity.Profession; -import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.SampleRowDAO; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.entity.WaoUserDAO; -import fr.ifremer.wao.io.ExportHelper; -import fr.ifremer.wao.io.WaoCsvHeader; -import fr.ifremer.wao.io.WaoCsvHeader.BOAT; -import fr.ifremer.wao.io.WaoCsvHeader.CONTACT; -import fr.ifremer.wao.io.WaoCsvHeader.ContactHeader; -import fr.ifremer.wao.io.WaoCsvHeader.FISHING_ZONE; -import fr.ifremer.wao.io.WaoCsvHeader.SAMPLING; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -67,24 +39,32 @@ import java.util.Date; import java.util.List; import java.util.Map; +import com.csvreader.CsvReader; +import com.csvreader.CsvWriter; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.nuiton.topia.framework.TopiaQuery; +import fr.ifremer.wao.*; +import fr.ifremer.wao.WaoBusinessException.Type; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ImportResults; +import fr.ifremer.wao.bean.ImportResultsImpl; +import fr.ifremer.wao.entity.*; +import fr.ifremer.wao.io.*; +import fr.ifremer.wao.io.WaoCsvHeader.*; /** * ServiceContactImpl * * Created: 3 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceContactImpl extends ServiceContactAbstract { @@ -521,6 +501,8 @@ } } + //dao.update(contact); + result.incNbImported(); } else { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -30,25 +37,16 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * ServiceNews * * Created: 17 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceNewsImpl extends ServiceNewsAbstract { - private static final Logger logger = - LoggerFactory.getLogger(ServiceNewsImpl.class); - private WaoContext context; public void setContext(WaoContext context) { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -50,11 +57,7 @@ * * Created: 30 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceReferentialImpl extends ServiceReferentialAbstract { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -72,11 +79,7 @@ * * Created: 30 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceSamplingImpl extends ServiceSamplingAbstract { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -66,11 +73,7 @@ * * Created: 7 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceSynthesisImpl extends ServiceSynthesisAbstract { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -52,11 +59,7 @@ * * Created: 27 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceUserImpl extends ServiceUserAbstract { Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,18 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,28 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,17 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,25 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="text" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="text"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,11 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,39 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="admin" class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="admin" type="boolean" access="field" column="admin" node="admin"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="admin" name="admin" node="admin" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,18 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,28 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,17 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,25 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="true" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="int" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="int"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" inverse="true" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" inverse="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,11 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,39 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="true" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="true" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="author" class="fr.ifremer.wao.entity.WaoUserImpl" column="author" lazy="false" node="author/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="author" embed-xml="false" lazy="false" name="author" node="author/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="role" type="int" access="field" column="role" node="role"/> - <property name="readOnly" type="boolean" access="field" column="readOnly" node="readOnly"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="role" name="role" node="role" type="int"/> + <property access="field" column="readOnly" name="readOnly" node="readOnly" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/resources/oldmappings/Wao/1.2/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,18 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,28 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,17 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,25 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="text" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="text"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,11 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,39 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="admin" class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="admin" type="boolean" access="field" column="admin" node="admin"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="admin" name="admin" node="admin" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,18 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,28 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,17 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,25 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="text" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="text"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,11 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,39 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="admin" class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="admin" type="boolean" access="field" column="admin" node="admin"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="admin" name="admin" node="admin" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="year" type="int" access="field" column="year" node="year"/> - <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> - <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> - <key column="activityCalendar"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityCalendarImpl" node="fr.ifremer.wao.entity.ActivityCalendarImpl" proxy="fr.ifremer.wao.entity.ActivityCalendar" table="activityCalendar"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="year" name="year" node="year" type="int"/> + <property access="field" column="fiability" name="fiability" node="fiability" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityMonth" node="activityMonth" order-by="month"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> - <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> - <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> - <property name="month" type="int" access="field" column="month" node="month"/> - <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> - <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> - <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> - <key column="activityMonth"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityMonthImpl" node="fr.ifremer.wao.entity.ActivityMonthImpl" proxy="fr.ifremer.wao.entity.ActivityMonth" table="activityMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="harbourLibelle" name="harbourLibelle" node="harbourLibelle" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="nbBoardingPersons" name="nbBoardingPersons" node="nbBoardingPersons" type="java.lang.Integer"/> + <property access="field" column="nbSeaDays" name="nbSeaDays" node="nbSeaDays" type="java.lang.Integer"/> + <property access="field" column="nbFishingDays" name="nbFishingDays" node="nbFishingDays" type="java.lang.Integer"/> + <property access="field" column="month" name="month" node="month" type="int"/> + <property access="field" column="harbourCode" name="harbourCode" node="harbourCode" type="text"/> + <property access="field" column="harbourId" name="harbourId" node="harbourId" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityProfession" node="activityProfession" order-by="professionOrder"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" embed-xml="false" name="activityCalendar" node="activityCalendar/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,18 +1,46 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="id" type="int" access="field" column="id" node="id"/> - <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> - <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> - <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> - <key column="activityProfession"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityProfessionImpl" node="fr.ifremer.wao.entity.ActivityProfessionImpl" proxy="fr.ifremer.wao.entity.ActivityProfession" table="activityProfession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" name="code" node="code" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="id" name="id" node="id" type="int"/> + <property access="field" column="professionOrder" name="professionOrder" node="professionOrder" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" embed-xml="false" name="activityMonth" node="activityMonth/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityZone" node="activityZone" order-by="zoneId"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> - <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> - <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> - <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> - <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> - <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ActivityZoneImpl" node="fr.ifremer.wao.entity.ActivityZoneImpl" proxy="fr.ifremer.wao.entity.ActivityZone" table="activityZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="zoneCode" name="zoneCode" node="zoneCode" type="text"/> + <property access="field" column="zoneLibelle" name="zoneLibelle" node="zoneLibelle" type="text"/> + <property access="field" column="zoneId" name="zoneId" node="zoneId" type="int"/> + <property access="field" column="gradiantCode" name="gradiantCode" node="gradiantCode" type="int"/> + <property access="field" column="gradiantLibelle" name="gradiantLibelle" node="gradiantLibelle" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" embed-xml="false" name="activityProfession" node="activityProfession/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,28 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> - <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> - <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> - <key column="boat"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatImpl" node="fr.ifremer.wao.entity.BoatImpl" proxy="fr.ifremer.wao.entity.Boat" table="boat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="immatriculation" index="boat_immatriculation_idx" name="immatriculation" node="immatriculation" type="int" unique="true"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <property access="field" column="boatLength" name="boatLength" node="boatLength" type="int"/> + <property access="field" column="buildYear" name="buildYear" node="buildYear" type="int"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" embed-xml="false" lazy="false" name="shipOwner" node="shipOwner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="companyBoatInfos" node="companyBoatInfos"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="activityCalendar" node="activityCalendar"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,17 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> - <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> - <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> - <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> - <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.BoatInfosImpl" node="fr.ifremer.wao.entity.BoatInfosImpl" proxy="fr.ifremer.wao.entity.BoatInfos" table="boatInfos"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="contactFirstName" name="contactFirstName" node="contactFirstName" type="text"/> + <property access="field" column="contactLastName" name="contactLastName" node="contactLastName" type="text"/> + <property access="field" column="contactEmail" name="contactEmail" node="contactEmail" type="text"/> + <property access="field" column="contactPhoneNumber" name="contactPhoneNumber" node="contactPhoneNumber" type="text"/> + <property access="field" column="dup" name="dup" node="dup" type="java.lang.Integer"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,25 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="address1" type="text" access="field" column="address1" node="address1"/> - <property name="address2" type="text" access="field" column="address2" node="address2"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <property name="city" type="text" access="field" column="city" node="city"/> - <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> - <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> - <key column="company"/> - <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.CompanyImpl" node="fr.ifremer.wao.entity.CompanyImpl" proxy="fr.ifremer.wao.entity.Company" table="company"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="address1" name="address1" node="address1" type="text"/> + <property access="field" column="address2" name="address2" node="address2" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <property access="field" column="city" name="city" node="city" type="text"/> + <property access="field" column="postalCode" name="postalCode" node="postalCode" type="int"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="waoUser" node="waoUser"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="boatBoatInfos" node="boatBoatInfos"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> - <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> - <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> - <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> - <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> - <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="state" type="text" access="field" column="state" node="state"/> - <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> - <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ContactImpl" node="fr.ifremer.wao.entity.ContactImpl" proxy="fr.ifremer.wao.entity.Contact" table="contact"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="tideBeginDate" name="tideBeginDate" node="tideBeginDate" type="java.util.Date"/> + <property access="field" column="tideEndDate" name="tideEndDate" node="tideEndDate" type="java.util.Date"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="mammalsObservation" name="mammalsObservation" node="mammalsObservation" type="boolean"/> + <property access="field" column="mammalsCapture" name="mammalsCapture" node="mammalsCapture" type="boolean"/> + <property access="field" column="validationProgram" name="validationProgram" node="validationProgram" type="java.lang.Boolean"/> + <property access="field" column="validationCompany" name="validationCompany" node="validationCompany" type="java.lang.Boolean"/> + <property access="field" column="dataInputDate" name="dataInputDate" node="dataInputDate" type="java.util.Date"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="state" name="state" node="state" type="text"/> + <property access="field" column="tideNbDays" name="tideNbDays" node="tideNbDays" type="int"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" embed-xml="false" name="observer" node="observer/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" lazy="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> - <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> - <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ElligibleBoatImpl" node="fr.ifremer.wao.entity.ElligibleBoatImpl" proxy="fr.ifremer.wao.entity.ElligibleBoat" table="elligibleBoat"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="globalActive" name="globalActive" node="globalActive" type="boolean"/> + <property access="field" column="companyActive" name="companyActive" node="companyActive" type="java.lang.Boolean"/> + <many-to-one class="fr.ifremer.wao.entity.BoatImpl" column="boat" embed-xml="false" lazy="false" name="boat" node="boat/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,16 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> - <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> - <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> - <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> - <key column="fishingZone"/> - <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.FishingZoneImpl" node="fr.ifremer.wao.entity.FishingZoneImpl" proxy="fr.ifremer.wao.entity.FishingZone" table="fishingZone"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="sectorName" name="sectorName" node="sectorName" type="text"/> + <property access="field" column="facadeName" name="facadeName" node="facadeName" type="text"/> + <property access="field" column="districtCode" name="districtCode" node="districtCode" type="text"/> + <bag embed-xml="true" lazy="true" name="sampleRow" node="sampleRow" table="fishingzone_samplerow"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="topiaId" order-by="code"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,11 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="content" type="text" access="field" column="content" node="content"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.NewsImpl" node="fr.ifremer.wao.entity.NewsImpl" proxy="fr.ifremer.wao.entity.News" table="news"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="content" name="content" node="content" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> - <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> - <property name="size" type="text" access="field" column="size" node="size"/> - <property name="other" type="text" access="field" column="other" node="other"/> - <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> - <property name="species" type="text" access="field" column="species" node="species"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ProfessionImpl" node="fr.ifremer.wao.entity.ProfessionImpl" proxy="fr.ifremer.wao.entity.Profession" table="profession"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="codeDCF5" name="codeDCF5" node="codeDCF5" type="text"/> + <property access="field" column="meshSize" name="meshSize" node="meshSize" type="text"/> + <property access="field" column="size" name="size" node="size" type="text"/> + <property access="field" column="other" name="other" node="other" type="text"/> + <property access="field" column="libelle" name="libelle" node="libelle" type="text"/> + <property access="field" column="species" name="species" node="species" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> - <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> - <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleMonthImpl" node="fr.ifremer.wao.entity.SampleMonthImpl" proxy="fr.ifremer.wao.entity.SampleMonth" table="sampleMonth"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="realTidesValue" name="realTidesValue" node="realTidesValue" type="int"/> + <property access="field" column="expectedTidesValue" name="expectedTidesValue" node="expectedTidesValue" type="int"/> + <property access="field" column="periodDate" name="periodDate" node="periodDate" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,39 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> - <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> - <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> - <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="programName" type="text" access="field" column="programName" node="programName"/> - <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> - <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> - <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> - <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> - <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> - <key column="sampleRow"/> - <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> - </bag> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="sampleRow"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowImpl" node="fr.ifremer.wao.entity.SampleRowImpl" proxy="fr.ifremer.wao.entity.SampleRow" table="sampleRow"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="nbObservants" name="nbObservants" node="nbObservants" type="int"/> + <property access="field" column="averageTideTime" name="averageTideTime" node="averageTideTime" type="double"/> + <property access="field" column="code" index="sampleRow_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="fishingZonesInfos" name="fishingZonesInfos" node="fishingZonesInfos" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="programName" name="programName" node="programName" type="text"/> + <property access="field" column="periodBegin" name="periodBegin" node="periodBegin" type="java.util.Date"/> + <property access="field" column="periodEnd" name="periodEnd" node="periodEnd" type="java.util.Date"/> + <many-to-one class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" embed-xml="false" lazy="false" name="profession" node="profession/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleMonth" node="sampleMonth" order-by="periodDate"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" lazy="false" name="company" node="company/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="sampleRowLog" node="sampleRowLog" order-by="topiaCreateDate desc"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="false" name="elligibleBoat" node="elligibleBoat" order-by="companyActive"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="true" inverse="true" lazy="false" name="fishingZone" node="fishingZone" table="fishingzone_samplerow"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" node="topiaId" order-by="facadeName,sectorName,districtCode"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="logText" type="text" access="field" column="logText" node="logText"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> - <many-to-one name="admin" class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.SampleRowLogImpl" node="fr.ifremer.wao.entity.SampleRowLogImpl" proxy="fr.ifremer.wao.entity.SampleRowLog" table="sampleRowLog"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="logText" name="logText" node="logText" type="text"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <many-to-one class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" embed-xml="false" name="sampleRow" node="sampleRow/@topiaId"/> + <many-to-one class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" embed-xml="false" lazy="false" name="admin" node="admin/@topiaId"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,12 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.ShipOwnerImpl" node="fr.ifremer.wao.entity.ShipOwnerImpl" proxy="fr.ifremer.wao.entity.ShipOwner" table="shipOwner"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="code" index="shipOwner_code_idx" name="code" node="code" type="text" unique="true"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,49 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> - <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="active" type="boolean" access="field" column="active" node="active"/> - <property name="admin" type="boolean" access="field" column="admin" node="admin"/> - <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> - <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> - <key column="observer"/> - <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.wao.entity"> + <class abstract="false" name="fr.ifremer.wao.entity.WaoUserImpl" node="fr.ifremer.wao.entity.WaoUserImpl" proxy="fr.ifremer.wao.entity.WaoUser" table="waoUser"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="timestamp"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="phoneNumber" name="phoneNumber" node="phoneNumber" type="text"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="active" name="active" node="active" type="boolean"/> + <property access="field" column="admin" name="admin" node="admin" type="boolean"/> + <many-to-one class="fr.ifremer.wao.entity.CompanyImpl" column="company" embed-xml="false" name="company" node="company/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="contact" node="contact"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Property changes on: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/sql/indexes.sql ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/xmi/wao.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/main/xmi/wao.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/site/rst/index.rst =================================================================== --- trunk/wao-business/src/site/rst/index.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/site/rst/index.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +.. - +.. * #%L +.. * Wao :: Business +.. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Accueil ======= Property changes on: trunk/wao-business/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/site/site_fr.xml =================================================================== --- trunk/wao-business/src/site/site_fr.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/site/site_fr.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Property changes on: trunk/wao-business/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -60,19 +67,13 @@ * * Created: 1 mars 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @Ignore public class ErrorDB1_0Test { private static TestManager manager; - private static final Logger log = LoggerFactory.getLogger(ErrorDB1_0Test.class); - private static Writer writerAll; private static Writer writerKos; Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -53,11 +60,7 @@ * * Created: 23 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @Ignore public class TestManager { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao; @@ -37,11 +44,7 @@ * * Created: 27 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoUtilsTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -24,9 +31,6 @@ import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.TestManager; -import fr.ifremer.wao.service.ServiceContactImpl; -import fr.ifremer.wao.service.ServiceSamplingImpl; -import fr.ifremer.wao.service.ServiceUserImpl; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceSampling; @@ -50,11 +54,7 @@ * * Created: 15 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -35,18 +42,12 @@ * * Created: 21 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatInfosImplTest { private static TestManager manager; - private static final Logger log = LoggerFactory.getLogger(BoatInfosImplTest.class); - public BoatInfosImplTest() { } Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.entity; @@ -43,11 +50,7 @@ * * Created: 30 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class SampleRowImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.io; @@ -47,7 +54,7 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ImportHelperTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -45,11 +52,7 @@ * * Created: 11 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ActivityCalendarImportTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -30,21 +37,7 @@ import fr.ifremer.wao.bean.CompanyBoatInfos; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.UserRole; -import fr.ifremer.wao.entity.ActivityCalendar; -import fr.ifremer.wao.entity.ActivityCalendarDAO; -import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.BoatDAO; -import fr.ifremer.wao.entity.BoatInfos; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.CompanyDAO; -import fr.ifremer.wao.entity.CompanyImpl; -import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ElligibleBoat; -import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.SampleRowDAO; -import fr.ifremer.wao.entity.SampleRowLogImpl; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.entity.WaoUserImpl; +import fr.ifremer.wao.entity.*; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -53,12 +46,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.*; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; @@ -67,7 +55,7 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceBoatImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -39,7 +46,7 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceReferentialImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -70,11 +77,7 @@ * * Created: 30 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceSamplingImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -56,7 +63,7 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceSynthesisImplTest { Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Business + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.service; @@ -39,7 +46,7 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ServiceUserImplTest { @@ -209,4 +216,4 @@ } -} \ No newline at end of file +} Property changes on: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/WaoTest.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/activity.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/activity.csv.gz ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/contacts.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/dates.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/echantillonnage.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/misc.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/navires.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/import/zonesPeche.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-business/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.base; @@ -74,11 +81,7 @@ * * </pre> * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public abstract class AbstractFilteredPage implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ -/** - * *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.base; @@ -41,11 +48,7 @@ * A generic selection model whose value is the id of the chosen object, not the object itself. * * @param <T> - * @author fdesbois - * @version $Revision: 3 $ - * - * Last update: $Date: 2009-07-31 16:54:15 +0200 (ven. 31 juil. 2009) $ - * by : $Author: fdesbois $ + * @author fdesbois <fdesbois at codelutin.com> */ public class GenericSelectModel<T> extends AbstractSelectModel { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.base; @@ -26,11 +33,7 @@ * * Created: 3 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public interface WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.components; @@ -29,11 +36,7 @@ * * Created: 18 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BooleanImage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,30 @@ -/* *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%*/ + * #L% + */ package fr.ifremer.wao.ui.components; @@ -37,8 +46,7 @@ /** * - * @author rannou - * @version $Id$ + * @author fdesbois <fdesbois at codelutin.com> */ public class Chart { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,30 @@ -/* *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%*/ + * #L% + */ package fr.ifremer.wao.ui.components; @@ -48,7 +57,7 @@ * </pre> * * @author rannou - * @version $Id: FeedBack.java 2736 2009-08-19 15:48:01Z nrannou $ + * @author fdesbois <fdesbois at codelutin.com> */ public class FeedBack { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.components; @@ -49,11 +56,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class Layout { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SubmitContext.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SubmitContext.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SubmitContext.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,36 +1,19 @@ -/* - * *##% - * Wao :: Web Interface - * Copyright (C) 2009 - 2010 Ifremer +/** %%Ignore-License * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. + * Copyright 2007 The Apache Software Foundation * - * 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 Lesser Public License for more details. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -// Copyright 2007 The Apache Software Foundation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. package fr.ifremer.wao.ui.components; Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SubmitContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -41,11 +48,7 @@ * * @param <K> Type of the map key * @param <E> Type of the map value - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public abstract class AbstractMappedGridDataSource<K, E extends TopiaEntity> implements GridDataSource { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -37,11 +44,7 @@ * * Created: 19 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BoatDataSource extends AbstractMappedGridDataSource<Integer, Boat> { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -38,11 +45,7 @@ * * Created: 3 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class BusinessUtils { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -45,11 +52,7 @@ * * Created: 13 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ChartUtils { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -35,11 +42,7 @@ * * Created: 18 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactDataSource extends AbstractMappedGridDataSource<String, Contact> { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -32,11 +39,7 @@ * * Created: 2 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public abstract class ExportStreamResponse implements StreamResponse { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,35 +1,38 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; /** - * SynthesisID$ + * SynthesisID * * Created: 9 févr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public enum SynthesisId { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.data; @@ -34,11 +41,7 @@ * * Created: 18 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoPropertyChangeListener implements PropertyChangeListener { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ -/** - * *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.mixins; @@ -36,11 +43,7 @@ * A simple mixin for attaching a javascript confirmation box to the onclick * event of any component that implements ClientElement. * - * @author fdesbois - * @version $Revision: 3 $ - * - * Last update: $Date: 2009-07-31 16:54:15 +0200 (ven. 31 juil. 2009) $ - * by : $Author: fdesbois $ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeJavaScriptLibrary("context:js/dialog.js") public class Confirm { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.mixins; @@ -26,67 +33,42 @@ * * Created: 17 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ import org.apache.tapestry5.BindingConstants; - import org.apache.tapestry5.ClientElement; - import org.apache.tapestry5.ComponentResources; - import org.apache.tapestry5.Link; - import org.apache.tapestry5.RenderSupport; - import org.apache.tapestry5.annotations.Environmental; - import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; - import org.apache.tapestry5.annotations.InjectContainer; - import org.apache.tapestry5.annotations.Parameter; - import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.PageRenderLinkSource; @IncludeJavaScriptLibrary("context:js/dialog.js") - public class PopupPageLink { @Inject - private ComponentResources resources; @Environmental - private RenderSupport renderSupport; @InjectContainer - private ClientElement container; @Parameter(required = true, defaultPrefix = BindingConstants.LITERAL) - private String page; - - @Parameter(defaultPrefix = BindingConstants.LITERAL, value="800") - private String width; - - @Parameter(defaultPrefix = BindingConstants.LITERAL, value="600") - private String height; @Parameter - private Object[] context; @Inject Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ -/** - * *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.mixins; @@ -35,13 +42,10 @@ /** * ZoneUpdater.java * - * From http://tinybits.blogspot.com/2009/05/update-zone-on-any-client-side-event.h… by ingesol + * From <http://tinybits.blogspot.com/2009/05/update-zone-on-any-client-side-event.h…> + * by Inge Solvoll * * @author ingesol - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author: fdesbois $ */ @IncludeJavaScriptLibrary("context:js/ZoneUpdater.js") public class ZoneUpdater { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -54,11 +61,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/administration.css") public class Administration implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -47,11 +54,7 @@ * * Created: 14 déc. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/boats.css") public class BoatActivityCalendar implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -83,11 +90,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/boats.css") public class Boats extends AbstractFilteredPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -78,11 +85,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/contacts.css") public class Contacts extends AbstractFilteredPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -37,11 +44,7 @@ * * Created: 5 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ExceptionReport implements ExceptionReporter, WaoPage { /** Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -47,11 +54,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/news.css") public class Index implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,29 +1,35 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.WaoException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.FishingZone; @@ -73,11 +79,7 @@ * * Created: 26 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/sampling.css") public class SampleRowForm implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -48,11 +55,7 @@ * * Created: 12 janv. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/sampling.css") public class SampleRowHistoric implements WaoPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,27 +1,33 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; - import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.FacadeRow; @@ -66,11 +72,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/sampling.css") public class SamplingPlan extends AbstractFilteredPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,29 +1,35 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; -import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; import fr.ifremer.wao.bean.ContactAverageReactivity; @@ -33,7 +39,6 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceSynthesis; import fr.ifremer.wao.ui.base.AbstractFilteredPage; -import fr.ifremer.wao.ui.base.WaoPage; import fr.ifremer.wao.ui.data.BusinessUtils; import fr.ifremer.wao.ui.data.ChartUtils; import fr.ifremer.wao.ui.data.ChartUtils.ChartType; @@ -68,11 +73,7 @@ * * Created: 9 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.pages; @@ -42,11 +49,7 @@ * * Created: 10 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ @IncludeStylesheet("context:css/userProfile.css") public class UserProfile implements WaoPage { @@ -66,9 +69,6 @@ } @Inject - private Logger log; - - @Inject private ServiceUser serviceUser; @InjectComponent Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,21 +1,30 @@ -/* *##% +/* + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%*/ + * #L% + */ package fr.ifremer.wao.ui.services; @@ -26,7 +35,6 @@ import java.io.IOException; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.ioc.MappedConfiguration; import org.apache.tapestry5.ioc.OrderedConfiguration; import org.apache.tapestry5.ioc.ServiceBinder; @@ -45,7 +53,7 @@ * it's a good place to configure and extend Tapestry, or to place your own * service definitions. * - * @version $Id: AppModule.java 2766 2009-08-27 16:29:23Z nrannou $ + * @author fdesbois <fdesbois at codelutin.com> */ public class AppModule { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.services; @@ -37,11 +44,7 @@ * * Created: 18 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class ContactModelFactory { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java ___________________________________________________________________ Modified: svn:keywords - Author Date Revision + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,22 +1,29 @@ /* - * *##% + * #%L * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 Ifremer - * + * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%* + * #L% */ package fr.ifremer.wao.ui.services; @@ -38,11 +45,7 @@ * * Created: 24 nov. 2009 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class WaoManager implements Runnable, RegistryShutdownListener { Property changes on: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,45 @@ -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <t:if t:test="empty"> - <img src="${asset:context:img/help-22px.png}" title="${emptyTitle}" /> - <p:else> - <t:if t:test="value"> - <img src="${asset:context:img/true-22px.png}" title="${trueTitle}" /> - <p:else> - <img src="${asset:context:img/false-22px.png}" title="${falseTitle}" /> - </p:else> - </t:if> - </p:else> - </t:if> - -</html> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <t:if t:test="empty"> + <img src="${asset:context:img/help-22px.png}" title="${emptyTitle}" /> + <p:else> + <t:if t:test="value"> + <img src="${asset:context:img/true-22px.png}" title="${trueTitle}" /> + <p:else> + <img src="${asset:context:img/false-22px.png}" title="${falseTitle}" /> + </p:else> + </t:if> + </p:else> + </t:if> + +</html> Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### login-label: Identifiant password-label: Mot de passe -email-label: Votre identifiant \ No newline at end of file +email-label: Votre identifiant Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,154 +1,183 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> - <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> - <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> - <script type="text/javascript" src="${asset:context:js/wao.js}"/> - </head> - <t:if t:test="currentUserExists"> - <body> - <t:unless t:test="devEnvironment"> -  - <script type="text/javascript"> - var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); - document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); - </script> - <script type="text/javascript"> - try { - var pageTracker = _gat._getTracker("UA-12982015-1"); - pageTracker._trackPageview(); - } catch(err) {} - </script> - </t:unless> - <div id="so-session" class="clearfix"> - <div class="fleft"> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur la page d'accueil"/> - </a>  - </div> - <div class="fleft"> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> - <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> - </a> - </div> - <div id="user-infos" class="fleft"> - Vous êtes <strong>${currentUser.fullName}</strong> de la société <strong>${currentUser.company.name}</strong> - (${accessText}) - </div> - <div id="user-actions" class="fright"> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> - </a> - <a t:type="pagelink" t:page="userProfile" title="Gestion profil"> - <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> - </a> - <a t:type="actionlink" t:id="exit" title="Déconnexion"> - <img src="${asset:context:img/exit.png}" alt="Exit" title="Déconnexion"/> - </a> - </div> - </div> - <ul class="clearfix" id="so-menu"> - <li class="link${adminClass} ${samplingSelected}" onclick="location.href='${contextPath}/samplingPlan'" - title="Plan d'échantillonnage"> - Plan d'Echantillonnage - </li> - <li class="sep"> </li> - <li class="link${adminClass} ${boatsSelected}" onclick="location.href='${contextPath}/boats'" title="Liste des navires"> - Navires - </li> - <li class="sep"> </li> - <li class="link${adminClass} ${contactsSelected}" onclick="location.href='${contextPath}/contacts'" title="Liste des contacts"> - Contacts - </li> - <li class="sep"> </li> - <li class="link${adminClass} ${synthesisSelected}" onclick="location.href='${contextPath}/synthesis'" title="Synthèses et indicateurs"> - Synthèse - </li> - <t:if t:test="currentUser.admin"> - <li class="sep"> </li> - <li class="link${adminClass} ${adminSelected}" onclick="location.href='${contextPath}/administration'" title="Administration"> - Administration - </li> - </t:if> - </ul> - - <div id="${contentId}"> - <t:feedback t:id="contentFeedback" t:autoClear="false"/> - <t:if t:test="displayBody()"> - <t:body /> - </t:if> - </div> - <div id="so-footer"> - <p> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> - WAO - </a> - <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> - ${version} - </a> - - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank"> - Obsmer - </a> - - <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="blank"> - Ifremer SIH - </a> - - <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> - GPLv3 - </a> - Copyright 2009-2010 - <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> - Ifremer</a>, - <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> - Code Lutin - </a> -  - </p> - <p class="cnil"> - Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à - la CNIL sous le numéro suivant : 1414476 - </p> - </div> - </body> - -  - <p:else> - <body class="so-connexion"> - <div id="so-connexion-feedback"> - <t:feedback t:id="connexionFeedback" /> - <t:if t:test="hasConnexionErrors()"> - <form t:type="form" t:id="forgetPassword"> - <strong>Mot de passe oublié ?</strong>  - <t:label t:for="email" /> : - <input t:type="textfield" t:id="email" value="email" />  - <input class="ico accept" t:type="submit" value="Go" title="Envoyez moi un nouveau mot de passe" /> - </form> - </t:if> - </div> - <div class="clearfix" id="so-connexion-box"> - <form t:id="connexionForm" t:type="form"> - <div class="fleft clearfix" id="so-connexion-form"> - <p><t:label for="login" /> : </p> - <p><input t:type="textfield" t:id="login" t:value="login" /></p> - <p><t:label for="password" /> : </p> - <p><input t:type="passwordfield" t:id="password" t:value="password" /></p> - <div class="fright" id="so-connexion-form-buttons"> - <input class="ico accept" t:type="submit" value="Connexion" title="Connexion à l'application Wao" /> - </div> - </div> - <div class="fright" id="so-connexion-logo"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="Logo Obsmer"/> - </div> - </form> - </div> - - </body> -  - </p:else> - </t:if> -</html> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> + <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> + <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> + <script type="text/javascript" src="${asset:context:js/wao.js}"/> + </head> + <t:if t:test="currentUserExists"> + <body> + <t:unless t:test="devEnvironment"> +  + <script type="text/javascript"> + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); + </script> + <script type="text/javascript"> + try { + var pageTracker = _gat._getTracker("UA-12982015-1"); + pageTracker._trackPageview(); + } catch(err) {} + </script> + </t:unless> + <div id="so-session" class="clearfix"> + <div class="fleft"> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur la page d'accueil"/> + </a>  + </div> + <div class="fleft"> + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> + </a> + </div> + <div id="user-infos" class="fleft"> + Vous êtes <strong>${currentUser.fullName}</strong> de la société <strong>${currentUser.company.name}</strong> + (${accessText}) + </div> + <div id="user-actions" class="fright"> + <a t:type="pagelink" t:page="index" title="Page d'accueil"> + <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> + </a> + <a t:type="pagelink" t:page="userProfile" title="Gestion profil"> + <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> + </a> + <a t:type="actionlink" t:id="exit" title="Déconnexion"> + <img src="${asset:context:img/exit.png}" alt="Exit" title="Déconnexion"/> + </a> + </div> + </div> + <ul class="clearfix" id="so-menu"> + <li class="link${adminClass} ${samplingSelected}" onclick="location.href='${contextPath}/samplingPlan'" + title="Plan d'échantillonnage"> + Plan d'Echantillonnage + </li> + <li class="sep"> </li> + <li class="link${adminClass} ${boatsSelected}" onclick="location.href='${contextPath}/boats'" title="Liste des navires"> + Navires + </li> + <li class="sep"> </li> + <li class="link${adminClass} ${contactsSelected}" onclick="location.href='${contextPath}/contacts'" title="Liste des contacts"> + Contacts + </li> + <li class="sep"> </li> + <li class="link${adminClass} ${synthesisSelected}" onclick="location.href='${contextPath}/synthesis'" title="Synthèses et indicateurs"> + Synthèse + </li> + <t:if t:test="currentUser.admin"> + <li class="sep"> </li> + <li class="link${adminClass} ${adminSelected}" onclick="location.href='${contextPath}/administration'" title="Administration"> + Administration + </li> + </t:if> + </ul> + + <div id="${contentId}"> + <t:feedback t:id="contentFeedback" t:autoClear="false"/> + <t:if t:test="displayBody()"> + <t:body /> + </t:if> + </div> + <div id="so-footer"> + <p> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/" title="Documentation de l'application" target="blank"> + WAO + </a> + <a href="http://suiviobsmer.labs.libre-entreprise.org/wao/release-note.html" title="Modifications faites pour cette version" target="blank"> + ${version} + </a> - + <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer" target="blank"> + Obsmer + </a> - + <a href="http://www.ifremer.fr/sih" title="Page d'accueil du SIH" target="blank"> + Ifremer SIH + </a> - + <a href="http://www.gnu.org/licenses/gpl.html" title="License GPL v3" target="blank"> + GPLv3 + </a> - Copyright 2009-2010 + <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> + Ifremer</a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="blank"> + Code Lutin + </a> +  + </p> + <p class="cnil"> + Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à + la CNIL sous le numéro suivant : 1414476 + </p> + </div> + </body> + +  + <p:else> + <body class="so-connexion"> + <div id="so-connexion-feedback"> + <t:feedback t:id="connexionFeedback" /> + <t:if t:test="hasConnexionErrors()"> + <form t:type="form" t:id="forgetPassword"> + <strong>Mot de passe oublié ?</strong>  + <t:label t:for="email" /> : + <input t:type="textfield" t:id="email" value="email" />  + <input class="ico accept" t:type="submit" value="Go" title="Envoyez moi un nouveau mot de passe" /> + </form> + </t:if> + </div> + <div class="clearfix" id="so-connexion-box"> + <form t:id="connexionForm" t:type="form"> + <div class="fleft clearfix" id="so-connexion-form"> + <p><t:label for="login" /> : </p> + <p><input t:type="textfield" t:id="login" t:value="login" /></p> + <p><t:label for="password" /> : </p> + <p><input t:type="passwordfield" t:id="password" t:value="password" /></p> + <div class="fright" id="so-connexion-form-buttons"> + <input class="ico accept" t:type="submit" value="Connexion" title="Connexion à l'application Wao" /> + </div> + </div> + <div class="fright" id="so-connexion-logo"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="Logo Obsmer"/> + </div> + </form> + </div> + + </body> +  + </p:else> + </t:if> +</html> Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### fishingZoneCsvFile-label: Fichier CSV des zones de p\u00EAche companies-label: Liste des soci\u00E9t\u00E9s name-label: Nom* @@ -20,4 +47,4 @@ # UserRole UserRole.ADMIN: Administrateur UserRole.OBSERVER: Observateur -UserRole.COORDINATOR: Coordinateur \ No newline at end of file +UserRole.COORDINATOR: Coordinateur Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,31 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### districtCode-label: Code Quartier name-label: Nom boatLength-label: Taille (m) -buildYear-label: Ann\u00E9e de construction \ No newline at end of file +buildYear-label: Ann\u00E9e de construction Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### boatsCsvFile-label: Fichier CSV des navires activityCalendarsCsvFile-label: Fichier CSV des calendriers d'activit\u00E9 @@ -35,4 +62,4 @@ shipOwner-label: Armateur fromDate-label: Sollicitations du navire depuis le dup-label: Capacit\u00E9 d'accueil du navire en personnels sp\u00E9cialis\u00E9s -comment-label: Commentaire \ No newline at end of file +comment-label: Commentaire Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # ContactForm labels facadeName-label: Facade sectorName-label: Secteur Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # ContactForm labels state-label: Etat boat-label: Navire Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,2 +1,29 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### title-label: Titre -content-label: Texte : \ No newline at end of file +content-label: Texte : Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # FOR PROFESSION PART professionSelect-label: Code m\u00E9tier codeDCF5-label: Code DCF Niv. 5* @@ -24,4 +51,4 @@ comment-label: Commentaire sur la ligne # FORM -errors-banner: La ligne n'a pas \u00E9t\u00E9 sauvegard\u00E9 \u00E0 cause des erreurs suivantes : \ No newline at end of file +errors-banner: La ligne n'a pas \u00E9t\u00E9 sauvegard\u00E9 \u00E0 cause des erreurs suivantes : Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### samplingPlanCsvFile-label: Fichier CSV du plan d'\u00E9chantillonnage periodBegin-label: P\u00E9riode du periodEnd-label: Jusqu'au @@ -6,4 +33,4 @@ codeDCF5-label: M\u00E9tier code DCF5 facadeName-label: Fa\u00E7ade sectorName-label: Zone -sampleRow-label: Code ligne \ No newline at end of file +sampleRow-label: Code ligne Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### periodBegin-label: D\u00E9but periodEnd-label: Fin boatName-label: Nom @@ -23,4 +50,4 @@ filterPeriodForContactStates-periodBeginForContactStates-required-message: La date de d\u00E9but est obligatoire filterPeriodForContactStates-periodEndForContactStates-required-message: La date de fin est obligatoire #filterPeriodForAllegroReactivity-periodBeginForAllegroReactivity-required-message: La date de d\u00E9but est obligatoire -#filterPeriodForAllegroReactivity-periodEndForAllegroReactivity-required-message: La date de fin est obligatoire \ No newline at end of file +#filterPeriodForAllegroReactivity-periodEndForAllegroReactivity-required-message: La date de fin est obligatoire Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### firstName-label: Pr\u00E9nom lastName-label: Nom login-label: Id. connexion (email) @@ -5,4 +32,4 @@ phoneNumber-label: T\u00E9l\u00E9phone password-label: Nouveau mot de passe password2-label: V\u00E9rification mot de passe -active-label: Actif \ No newline at end of file +active-label: Actif Property changes on: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/log4j.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=WARN, console, globalfile Property changes on: trunk/wao-ui/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### required=Le champs %s est requis. minimum-string-length=Le champs %2$s doit contenir plus de %1$d caract\u00E8res. maximum-string-length=Le champs %2$s est limit\u00E9 \u00E0 %1$d caract\u00E8res. Property changes on: trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,83 +1,112 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Administration" t:contentId="so-admin" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <div class="so-import"> - <fieldset> - <legend>Import des zones de pêche</legend> - <form t:type="form" t:id="importFishingZones"> - <t:errors /> - <t:label for="fishingZoneCsvFile" /> : - <input t:type="upload" t:id="fishingZoneCsvFile" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" title="Importer des zones de pêche (format CSV avec encodage UTF-8)" /> - </form> - </fieldset> - </div> - - <form class="actions clearfix" t:type="form" t:id="actionsForm"> - <div class="fields fleft"> - <t:label t:for="companies" /> : - <input t:type="select" t:id="companies" t:model="companiesSelectModel" t:value="companyId" /> - </div> - <div class="icons fleft"> - <input t:type="submit" t:id="showUsers" class="ico search" value="Show Details" t:title="Afficher détails" /> - <input t:type="submit" t:id="addNewCompany" class="ico add" value="Add new company" t:title="Ajouter une nouvelle société" /> - </div> - </form> - - <fieldset class="user-form clearfix"> - <form t:type="beaneditform" class="clearfix" t:id="company" - t:include="name, address1, address2, postalCode, city, phoneNumber, email, active"> - <p:name> - <t:label t:for="name" /> - <input t:type="textfield" t:id="name" t:validate="required" value="company.name" /> - </p:name> - </form> - </fieldset> - - <t:if t:test="usersAvailable"> - <form class="actions clearfix" t:type="form" t:id="userActionsForm"> - <div class="fields fleft"> - <t:label t:for="users" /> : - <input t:type="select" t:id="users" t:model="usersSelectModel" t:value="userId" /> - </div> - <div class="icons fleft"> - <input t:type="submit" t:id="showUser" class="ico search" value="Show Details" t:title="Afficher détails" /> - <input t:type="submit" t:id="deleteUser" class="ico22px delete" value="Delete user" t:title="Supprimer cet utilisateur" - t:mixins="Confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet utilisateur ?" /> - <input t:type="submit" t:id="addNewUser" class="ico add" value="Add new company" t:title="Ajouter un nouvel utilisateur" /> - </div> - </form> - - <fieldset class="user-form clearfix"> - <form t:type="beaneditform" class="clearfix" t:id="user" - t:include="firstName, lastName, login, password, phoneNumber, userRole, readOnly, active"> - <p:firstName> - <label t:type="label" for="firstName" /> - <input t:type="textfield" t:id="firstName" value="user.firstName" t:validate="required" /> - </p:firstName> - <p:lastName> - <label t:type="label" for="lastName" /> - <input t:type="textfield" t:id="lastName" value="user.lastName" t:validate="required" /> - </p:lastName> - <p:login> - <label t:type="label" for="login" /> - <input t:type="textfield" t:id="login" value="user.login" t:validate="required" /> - </p:login> - <p:password> - <label t:type="label" for="generatePassword" /> - <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> - <span> ou définir manuellement : </span> - <input t:type="passwordfield" t:id="password2" value="password" /> - </p:password> - <p:userRole> - <label t:type="label" for="userRole" /> - <select t:type="select" t:id="userRole" t:value="user.userRole" t:validate="required"> - <option></option> - </select> - </p:userRole> - </form> - </fieldset> - </t:if> - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Administration" t:contentId="so-admin" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <div class="so-import"> + <fieldset> + <legend>Import des zones de pêche</legend> + <form t:type="form" t:id="importFishingZones"> + <t:errors /> + <t:label for="fishingZoneCsvFile" /> : + <input t:type="upload" t:id="fishingZoneCsvFile" t:validate="required" /> + <input t:type="submit" class="ico import" value="OK" title="Importer des zones de pêche (format CSV avec encodage UTF-8)" /> + </form> + </fieldset> + </div> + + <form class="actions clearfix" t:type="form" t:id="actionsForm"> + <div class="fields fleft"> + <t:label t:for="companies" /> : + <input t:type="select" t:id="companies" t:model="companiesSelectModel" t:value="companyId" /> + </div> + <div class="icons fleft"> + <input t:type="submit" t:id="showUsers" class="ico search" value="Show Details" t:title="Afficher détails" /> + <input t:type="submit" t:id="addNewCompany" class="ico add" value="Add new company" t:title="Ajouter une nouvelle société" /> + </div> + </form> + + <fieldset class="user-form clearfix"> + <form t:type="beaneditform" class="clearfix" t:id="company" + t:include="name, address1, address2, postalCode, city, phoneNumber, email, active"> + <p:name> + <t:label t:for="name" /> + <input t:type="textfield" t:id="name" t:validate="required" value="company.name" /> + </p:name> + </form> + </fieldset> + + <t:if t:test="usersAvailable"> + <form class="actions clearfix" t:type="form" t:id="userActionsForm"> + <div class="fields fleft"> + <t:label t:for="users" /> : + <input t:type="select" t:id="users" t:model="usersSelectModel" t:value="userId" /> + </div> + <div class="icons fleft"> + <input t:type="submit" t:id="showUser" class="ico search" value="Show Details" t:title="Afficher détails" /> + <input t:type="submit" t:id="deleteUser" class="ico22px delete" value="Delete user" t:title="Supprimer cet utilisateur" + t:mixins="Confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet utilisateur ?" /> + <input t:type="submit" t:id="addNewUser" class="ico add" value="Add new company" t:title="Ajouter un nouvel utilisateur" /> + </div> + </form> + + <fieldset class="user-form clearfix"> + <form t:type="beaneditform" class="clearfix" t:id="user" + t:include="firstName, lastName, login, password, phoneNumber, userRole, readOnly, active"> + <p:firstName> + <label t:type="label" for="firstName" /> + <input t:type="textfield" t:id="firstName" value="user.firstName" t:validate="required" /> + </p:firstName> + <p:lastName> + <label t:type="label" for="lastName" /> + <input t:type="textfield" t:id="lastName" value="user.lastName" t:validate="required" /> + </p:lastName> + <p:login> + <label t:type="label" for="login" /> + <input t:type="textfield" t:id="login" value="user.login" t:validate="required" /> + </p:login> + <p:password> + <label t:type="label" for="generatePassword" /> + <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> + <span> ou définir manuellement : </span> + <input t:type="passwordfield" t:id="password2" value="password" /> + </p:password> + <p:userRole> + <label t:type="label" for="userRole" /> + <select t:type="select" t:id="userRole" t:value="user.userRole" t:validate="required"> + <option></option> + </select> + </p:userRole> + </form> + </fieldset> + </t:if> + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/Administration.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml =================================================================== --- trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,135 +1,164 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Calendrier d'activité" t:contentId="so-activity-calendar" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <t:if t:test="activityCalendar"> - <h1>Calendrier d'activité ${activityCalendar.year}</h1> - <p class="acenter"> - <a t:type="actionlink" t:id="returnToBoats" class="return" title="Retour sur ${activityCalendar.boat.name}"> - <img src="${asset:context:}/img/boat.png" alt="Navire"/>  - Revenir sur les informations du navire  - <img src="${asset:context:}/img/boat.png" alt="Navire"/> - </a> - </p> - - <table t:type="grid" id="so-activity-calendar-boat" t:source="boats" t:row="boat" - t:include="immatriculation, districtCode, name, boatLength, buildYear" /> - - <table id="so-activity-calendar-months"> - <thead> - <tr> - <td class="none"> </td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - ${monthName} - </td> - </tr> - </thead> - <tbody> - <tr> - <td class="title">Port exploit.</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityMonth"> - <span t:type="ck/Tooltip" title="Libelle" - t:value="prop:activityMonth.harbourLibelle" t:effect="appear"> - ${activityMonth.harbourCode} - </span> - <p:else> </p:else> - </t:if> - </td> - </tr> - <tr> - <td class="title">Actif/Inactif</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityMonth"> - <t:booleanImage t:value="activityMonth.active" t:trueTitle="Actif" t:falseTitle="Inactif"/> - <p:else> </p:else> - </t:if> - </td> - </tr> - <tr> - <td class="title">Hommes emb.</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityMonth"> - ${activityMonth.nbBoardingPersons} - <p:else> </p:else> - </t:if> - </td> - </tr> - <tr> - <td class="title">J. Mer eff.</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityMonth"> - ${activityMonth.nbSeaDays} - <p:else> </p:else> - </t:if> - </td> - </tr> - <tr> - <td class="title">J. Pêche eff.</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityMonth"> - ${activityMonth.nbFishingDays} - <p:else> </p:else> - </t:if> - </td> - </tr> - <t:if t:test="hasProfessions()"> - <t:loop t:source="0..${professionIndexMax}" t:index="professionIndex"> - <tr class="profession"> - <td class="title">Métier</td> - <td t:type="loop" class="month" t:source="1..12" t:value="month"> - <t:if t:test="activityProfession"> - <span t:type="ck/Tooltip" title="Libelle" - t:value="prop:activityProfession.libelle" t:effect="appear"> - ${activityProfession.code} - </span> - <p:else> </p:else> - </t:if> - </td> - </tr> - <tr t:type="loop" t:source="0..${zoneIndexMax}" t:index="zoneIndex"> - <td class="title">Zone/Grad.</td> - <td t:type="loop" class="zone month" t:source="1..12" t:value="month"> - <t:if t:test="activityZone"> - <span t:type="ck/Tooltip" title="Libelle" - t:value="prop:activityZone.zoneLibelle" t:effect="appear"> - ${activityZone.zoneCode} - </span> |  - ${activityZone.gradiantLibelle} - <p:else> </p:else> - </t:if> - </td> - </tr> - </t:loop> - </t:if> - </tbody> - </table> - - - - <p:else> - <div class="fb-error"> - Aucun calendrier d'activité chargé ! - </div> - </p:else> - </t:if> - - -</t:layout> - +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Calendrier d'activité" t:contentId="so-activity-calendar" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <t:if t:test="activityCalendar"> + <h1>Calendrier d'activité ${activityCalendar.year}</h1> + <p class="acenter"> + <a t:type="actionlink" t:id="returnToBoats" class="return" title="Retour sur ${activityCalendar.boat.name}"> + <img src="${asset:context:}/img/boat.png" alt="Navire"/>  + Revenir sur les informations du navire  + <img src="${asset:context:}/img/boat.png" alt="Navire"/> + </a> + </p> + + <table t:type="grid" id="so-activity-calendar-boat" t:source="boats" t:row="boat" + t:include="immatriculation, districtCode, name, boatLength, buildYear" /> + + <table id="so-activity-calendar-months"> + <thead> + <tr> + <td class="none"> </td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + ${monthName} + </td> + </tr> + </thead> + <tbody> + <tr> + <td class="title">Port exploit.</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityMonth"> + <span t:type="ck/Tooltip" title="Libelle" + t:value="prop:activityMonth.harbourLibelle" t:effect="appear"> + ${activityMonth.harbourCode} + </span> + <p:else> </p:else> + </t:if> + </td> + </tr> + <tr> + <td class="title">Actif/Inactif</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityMonth"> + <t:booleanImage t:value="activityMonth.active" t:trueTitle="Actif" t:falseTitle="Inactif"/> + <p:else> </p:else> + </t:if> + </td> + </tr> + <tr> + <td class="title">Hommes emb.</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityMonth"> + ${activityMonth.nbBoardingPersons} + <p:else> </p:else> + </t:if> + </td> + </tr> + <tr> + <td class="title">J. Mer eff.</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityMonth"> + ${activityMonth.nbSeaDays} + <p:else> </p:else> + </t:if> + </td> + </tr> + <tr> + <td class="title">J. Pêche eff.</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityMonth"> + ${activityMonth.nbFishingDays} + <p:else> </p:else> + </t:if> + </td> + </tr> + <t:if t:test="hasProfessions()"> + <t:loop t:source="0..${professionIndexMax}" t:index="professionIndex"> + <tr class="profession"> + <td class="title">Métier</td> + <td t:type="loop" class="month" t:source="1..12" t:value="month"> + <t:if t:test="activityProfession"> + <span t:type="ck/Tooltip" title="Libelle" + t:value="prop:activityProfession.libelle" t:effect="appear"> + ${activityProfession.code} + </span> + <p:else> </p:else> + </t:if> + </td> + </tr> + <tr t:type="loop" t:source="0..${zoneIndexMax}" t:index="zoneIndex"> + <td class="title">Zone/Grad.</td> + <td t:type="loop" class="zone month" t:source="1..12" t:value="month"> + <t:if t:test="activityZone"> + <span t:type="ck/Tooltip" title="Libelle" + t:value="prop:activityZone.zoneLibelle" t:effect="appear"> + ${activityZone.zoneCode} + </span> |  + ${activityZone.gradiantLibelle} + <p:else> </p:else> + </t:if> + </td> + </tr> + </t:loop> + </t:if> + </tbody> + </table> + + + + <p:else> + <div class="fb-error"> + Aucun calendrier d'activité chargé ! + </div> + </p:else> + </t:if> + + +</t:layout> + Property changes on: trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,381 +1,410 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Navires" t:contentId="so-boats" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <t:if t:test="canImportReferentials()"> - <div class="so-import"> - <fieldset> - <legend>Import des navires</legend> -  - <form t:type="form" t:id="importBoatsForm"> - <t:errors /> - <t:label for="boatsCsvFile" /> : - <input t:type="upload" t:id="boatsCsvFile" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" title="Importer une liste de navires (format CSV avec encodage UTF-8)" /> - </form> -  - </fieldset> - </div> - <t:unless t:test="activityCalendarImportRun"> - <div class="so-import clearfix"> - <fieldset> - <legend>Import des calendriers d'activité</legend> - <form t:type="form" t:id="importActivityCalendarsForm"> - <t:errors /> - <t:label for="activityCalendarsCsvFile" /> : - <input t:type="upload" t:id="activityCalendarsCsvFile" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" - title="Importer les calendriers d'activité des navires (format CSV avec encodage UTF-8)" /> - </form> - <t:if t:test="logAccessFileExists"> - <div class="fright"> - <a t:type="actionlink" t:id="showActivityCalendarLogAccessFile"> - <img src="${asset:context:}/img/text-access-32px.png" - title="Afficher le fichier de log des accès utilisateurs aux calendriers d'activité"/> - </a> - </div> - </t:if> - <t:if t:test="logFileExists"> - <div class="fright"> - <a t:type="actionlink" t:id="showActivityCalendarLogFile"> - <img src="${asset:context:}/img/text-32px.png" - title="Afficher le fichier de log de l'import des calendriers d'activité"/> - </a> - </div> - </t:if> - </fieldset> - </div> - <p:else> - <div class="fb-info"> - Import des calendriers d'activité en cours. <br /> - Vous pouvez continuer à naviguer sur le site en attendant la fin du chargement. - </div> - </p:else> - </t:unless> - </t:if> -  - -  - <div t:type="zone" class="so-filters" t:id="filtersZone" id="so-boats-filters"> - <fieldset> - <legend>Filtres de recherche</legend> - <div class="aright"> - <t:if t:test="filtersHidden"> - <a t:type="actionlink" t:id="showFilters" t:zone="so-boats-filters"> - <img src="${asset:context:}/img/downarrow.png" title="Afficher les filtres"/> - </a> - <p:else> - <a t:type="actionlink" t:id="hideFilters" t:zone="so-boats-filters"> - <img src="${asset:context:}/img/uparrow.png" title="Cacher les filtres"/> - </a> - </p:else> - </t:if> - </div> - <t:feedback t:id="filterFeedback" /> - <div class="so-filters-form ${hiddenStyle}"> - <form t:type="form" t:id="filtersForm" t:zone="so-boats-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div> -  - <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" - title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  - <t:label t:for="sectorName" />: - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <select t:type="select" t:id="sampleRow" t:disabled="sampleRowExists" t:model="sampleRowSelectModel" value="sampleRowId" /> - </div><p> </p> - <div> -  - <t:label t:for="boatName" /> - <span> nom </span> - <input t:type="textfield" t:id="boatName" class="width150" t:value="boatFilter.boatName" t:mixins="Autocomplete" /> - <span> immatriculation </span> - <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="boatFilter.boatImmatriculation" /> - <span> code quartier </span> - <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="boatFilter.boatDistrictCode" /> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les navires correspondants aux filtres saisies" />  - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> - </div> - </div> - </form> - </div> - </fieldset> - </div> - - - <div t:type="zone" t:id="boatsZone" t:update="show" class="clearfix"> -  - <div class="fleft" id="so-boats-list"> - <h1>Liste de ${boats.availableRows} navires  - <a t:type="actionlink" t:id="exportShowBoats"> - <img src="${asset:context:}/img/file-export-22px.png" alt="Export CSV" - title="Exporter les ${boats.availableRows} navires avec leurs informations privées" /> - </a> - </h1> - <div t:type="grid" t:source="boats" t:row="boat" - t:include="name, immatriculation, districtCode, boatLength, buildYear" t:rowClass="prop:rowStyle" t:rowsPerPage="20"> - <p:nameCell> - <t:if t:test="canCreateNewContactFromList()"> - <a t:type="actionlink" t:id="addNewContactFromBoat" t:context="boat.immatriculation"> - <img src="${asset:context:}/img/contact-22px.png" title="Créer un nouveau contact pour ce navire et la ligne sélectionnée dans les filtres"/> - </a>  - </t:if> - <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> - </p:nameCell> - <p:boatLengthCell> - ${boat.boatLength} m - </p:boatLengthCell> - </div> - </div> - -  - <t:if t:test="boatSelectedImmatriculation"> - <t:zone t:id="boatInfosZone" t:update="show" class="fleft" id="so-boats-boat-infos"> - <t:unless t:test="activityCalendarImportRun"> -  - <t:if t:test="user.admin"> - <h2>Informations sur ${boatSelected.name}</h2> - <form t:type="form" t:id="companySelectForm" t:zone="so-boats-boat-infos"> - <t:label t:for="company" /> : - <input t:type="select" t:id="company" t:model="companies" t:value="companySelectedId" />  - <input t:type="submit" class="ico search" t:id="searchCompany" value="Search" /> - </form> - </t:if> -  - <t:if t:test="companyBoatInfos"> - <t:delegate to="activeBoatInfosBlock" /> - </t:if> -  - <fieldset id="so-boats-boat-infos-calendar"> - <legend>Calendrier d'activité</legend> - <p> - <t:if t:test="hasActivityCalendar()"> - <a t:type="actionlink" t:id="showLastActivityCalendar"> - <img src="${asset:context:}/img/calendar.png" title="Calendrier d'activité"/> - </a> - <p:else> - <img src="${asset:context:}/img/calendar-unavailable.png" title="Calendrier d'activité indisponible"/> - </p:else> - </t:if> - </p> - </fieldset> -  - <t:unless t:test="user.admin"> - <div id="so-boats-boat-infos-message"> - Les données saisies dans cette page sont la propriété exclusive de la société. <br /> - En dehors de la société, seul l'administrateur peut les consulter pour des questions de maintenance sur le site.<br /> - L'administrateur est une personne de l'Ifremer. - </div> - </t:unless> - <p:else> - <div class="fb-info"> - Le chargement des calendriers d'activité est en cours. <br /> - Vous ne pouvez pas accéder aux informations du navire pour l'instant. <br /> - Veuillez réessayer ultérieurement. - - </div> - </p:else> - </t:unless> - </t:zone> - -  - <t:block t:id="displayBoatInfos"> - -  - <t:unless t:test="user.admin"> - <div class="clearfix"> - <div class="fleft"> - <h2>Informations sur ${boatInfos.boat.name}</h2> - </div> -  - <t:if t:test="canEditBoatInfos()"> - <div class="fright"> - <a t:type="actionlink" t:id="editBoatInfos" t:zone="so-boats-boat-infos"> - <img src="${asset:context:}/img/edit-32px.png" title="Editer les informations"/> - </a> - </div> - </t:if> - </div> - </t:unless> - -  - <t:if t:test="companyBoatInfos.lastContact"> - <fieldset id="so-boats-boat-infos-lastcontact"> - <legend>Dernier contact avec le navire pour votre société</legend> - <div class="${lastContactStyle}"> - <dl t:type="beandisplay" t:id="boatInfosLastContact" t:object="companyBoatInfos.lastContact" - t:include="referenceDate, state" t:add="createdBy, sampleRowCode"> - <p:createdBy> - ${companyBoatInfos.lastContact.observer.fullName} - </p:createdBy> - <p:sampleRowCode> - ${companyBoatInfos.lastContact.sampleRow.code} - </p:sampleRowCode> - </dl> - </div> - </fieldset> - </t:if> -  - <fieldset id="so-boats-boat-infos-contact"> - <legend>Contact</legend> - <div t:type="beandisplay" t:id="boatInfosContact" t:object="boatInfos" - t:include="contactFirstName, contactLastName, contactPhoneNumber, contactEmail, - contactAddress1, contactAddress2, contactPostalCode, contactCity, contactSiret" /> - </fieldset> - - -  - <fieldset id="so-boats-boat-infos-boarding"> - <legend>Autres informations sur le navire</legend> - <div> - <p> - <label>${message:shipOwner-label} : </label> - ${boatInfos.boat.shipOwner.firstName} ${boatInfos.boat.shipOwner.lastName} - </p> - <p class="sep"> </p> - <p> - <label>${message:dup-label} : </label> - <t:if t:test="boatInfos.dup"> - ${boatInfos.dup} - <p:else>non renseigné</p:else> - </t:if> - </p> - <p class="sep"> </p> - <p> - <form t:type="form" t:id="calculateBoardings" t:zone="so-boats-boat-infos"> - <t:label t:for="fromDate"/> : - <input t:type="datefield" t:id="fromDate" class="width70" value="boardingFromDate" />  - <input t:type="submit" class="ico refresh" t:id="refreshBoardings" value="Refresh" title="Recalculer les embarquements"/> - </form> - </p> - <p> - <strong>${boatInfos.boat.getNbBoarding(boardingFromDate)}</strong> embarquement(s) - dont <strong>${boatInfos.getNbBoardingForCompany(boardingFromDate)}</strong> dans votre société - </p> - <t:if t:test="companyBoatInfos.elligibleBoatsValues.size()"> - <p class="sep"> </p> - <label>Ligne(s) du plan associée(s) à ce navire :</label> - <ul> - <li t:type="loop" t:source="companyBoatInfos.elligibleBoatsValues" t:value="elligibleBoat"> - <span t:type="ck/Tooltip" title="Infos" t:value="prop:elligibleRowInfos" t:effect="appear"> - <span class="${elligibleRowStyle}"> - ${elligibleBoat.sampleRow.code} - </span>  - </span> - <t:if t:test="canCreateNewContactFromElligibleBoat()"> - <a t:type="actionlink" t:id="addNewContactFromSampleRow" t:context="elligibleBoat.sampleRow.code"> - <img src="${asset:context:}/img/contact-22px.png" title="Créer un nouveau contact pour ce navire et cette ligne du plan"/> - </a> - <p:else> - <t:unless t:test="user.admin"> - <img src="${asset:context:}/img/contact-unavailable-22px.png" title="Création d'un nouveau contact impossible"/> - </t:unless> - </p:else> - </t:if> - </li> - </ul> - </t:if> - <t:if t:test="boatInfos.comment"> - <p class="sep"> </p> - <label>Commentaire : </label> - <p class="comment">${boatInfos.comment}</p> - </t:if> - </div> - </fieldset> - </t:block> - -  - <t:block t:id="editBoatInfos"> - <form t:type="form" t:id="boatInfosForm" t:zone="so-boats-boat-infos"> - <t:errors /> - -  - <div class="clearfix"> - <div class="fleft"> - <h2>Informations sur ${boatInfos.boat.name}</h2> - </div> -  - <t:if t:test="canEditBoatInfos()"> - <div class="fright"> - <input t:type="submit" t:id="saveBoatInfos" class="ico save" value="Save" - title="Enregistrer les modifications" />  - <a t:type="actionlink" t:id="cancelEditBoatInfos" t:zone="so-boats-boat-infos"> - <img src="${asset:context:}/img/undo.png" title="Annuler les modifications"/> - </a> - </div> - </t:if> - </div> - -  -  - <fieldset id="so-boats-boat-infos-contact"> - <legend>Contact</legend> - <div class="t-beaneditor"> - <t:beaneditor t:id="editBoatInfosContact" t:object="boatInfos" - t:include="contactFirstName, contactLastName, contactPhoneNumber, contactEmail, - contactAddress1, contactAddress2, contactPostalCode, contactCity, contactSiret" /> - </div> - </fieldset> - -  - <fieldset id="so-boats-boat-infos-boarding"> - <legend>Autres informations sur le navire</legend> - <div> - <p><t:label t:for="dup"/> : <input t:type="textfield" t:id="dup" class="dup" value="boatInfos.dup" /></p> - <p class="sep"> </p> - - <p class="sep"> </p> - <label>Ligne(s) du plan :</label> - <ul> - <li t:type="loop" t:source="companyBoatInfos.elligibleBoatsValues" volatile="true" t:value="elligibleBoat"> - <span t:type="ck/Tooltip" title="Infos" t:value="prop:elligibleRowInfos" t:effect="appear"> - <span class="${elligibleRowStyle}"> - ${elligibleBoat.sampleRow.code} - </span>  - </span> - <t:if t:test="elligibleBoatCompanyActiveFalse"> - <input t:type="submitContext" t:id="activeBoatInfosSampleRow" class="ico add" value="Active" - t:context="elligibleBoat.sampleRow.code" title="Réactiver cette ligne du plan" /> - <p:else> - <input t:type="submitContext" t:id="removeBoatInfosSampleRow" class="ico remove" value="Remove" - t:context="elligibleBoat.sampleRow.code" title="Dissocier le navire de cette ligne du plan" /> - </p:else> - </t:if> - </li> - </ul> - <p> - <input t:type="select" t:id="sampleRowSelect" t:model="sampleRowSelectModel" - t:value="boatInfosSampleRowId"/> - <input t:type="submit" t:id="addBoatInfosSampleRow" class="ico add" value="Add" - t:title="Associer à une ligne du plan" /> - </p> - <p class="sep"> </p> - <t:label t:for="comment"/> : - <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="boatInfos.comment"/></p> - </div> - </fieldset> - </form> - </t:block> - - </t:if> - </div> -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Navires" t:contentId="so-boats" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <t:if t:test="canImportReferentials()"> + <div class="so-import"> + <fieldset> + <legend>Import des navires</legend> +  + <form t:type="form" t:id="importBoatsForm"> + <t:errors /> + <t:label for="boatsCsvFile" /> : + <input t:type="upload" t:id="boatsCsvFile" t:validate="required" /> + <input t:type="submit" class="ico import" value="OK" title="Importer une liste de navires (format CSV avec encodage UTF-8)" /> + </form> +  + </fieldset> + </div> + <t:unless t:test="activityCalendarImportRun"> + <div class="so-import clearfix"> + <fieldset> + <legend>Import des calendriers d'activité</legend> + <form t:type="form" t:id="importActivityCalendarsForm"> + <t:errors /> + <t:label for="activityCalendarsCsvFile" /> : + <input t:type="upload" t:id="activityCalendarsCsvFile" t:validate="required" /> + <input t:type="submit" class="ico import" value="OK" + title="Importer les calendriers d'activité des navires (format CSV avec encodage UTF-8)" /> + </form> + <t:if t:test="logAccessFileExists"> + <div class="fright"> + <a t:type="actionlink" t:id="showActivityCalendarLogAccessFile"> + <img src="${asset:context:}/img/text-access-32px.png" + title="Afficher le fichier de log des accès utilisateurs aux calendriers d'activité"/> + </a> + </div> + </t:if> + <t:if t:test="logFileExists"> + <div class="fright"> + <a t:type="actionlink" t:id="showActivityCalendarLogFile"> + <img src="${asset:context:}/img/text-32px.png" + title="Afficher le fichier de log de l'import des calendriers d'activité"/> + </a> + </div> + </t:if> + </fieldset> + </div> + <p:else> + <div class="fb-info"> + Import des calendriers d'activité en cours. <br /> + Vous pouvez continuer à naviguer sur le site en attendant la fin du chargement. + </div> + </p:else> + </t:unless> + </t:if> +  + +  + <div t:type="zone" class="so-filters" t:id="filtersZone" id="so-boats-filters"> + <fieldset> + <legend>Filtres de recherche</legend> + <div class="aright"> + <t:if t:test="filtersHidden"> + <a t:type="actionlink" t:id="showFilters" t:zone="so-boats-filters"> + <img src="${asset:context:}/img/downarrow.png" title="Afficher les filtres"/> + </a> + <p:else> + <a t:type="actionlink" t:id="hideFilters" t:zone="so-boats-filters"> + <img src="${asset:context:}/img/uparrow.png" title="Cacher les filtres"/> + </a> + </p:else> + </t:if> + </div> + <t:feedback t:id="filterFeedback" /> + <div class="so-filters-form ${hiddenStyle}"> + <form t:type="form" t:id="filtersForm" t:zone="so-boats-filters"> + <t:errors /> + <div class="t-beaneditor"> + <div> +  + <t:label t:for="facadeName" />: + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" + title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  + <t:label t:for="sectorName" />: + <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" + title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  + <t:label t:for="sampleRow" />: + <select t:type="select" t:id="sampleRow" t:disabled="sampleRowExists" t:model="sampleRowSelectModel" value="sampleRowId" /> + </div><p> </p> + <div> +  + <t:label t:for="boatName" /> + <span> nom </span> + <input t:type="textfield" t:id="boatName" class="width150" t:value="boatFilter.boatName" t:mixins="Autocomplete" /> + <span> immatriculation </span> + <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="boatFilter.boatImmatriculation" /> + <span> code quartier </span> + <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="boatFilter.boatDistrictCode" /> + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les navires correspondants aux filtres saisies" />  + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> + </div> + </div> + </form> + </div> + </fieldset> + </div> + + + <div t:type="zone" t:id="boatsZone" t:update="show" class="clearfix"> +  + <div class="fleft" id="so-boats-list"> + <h1>Liste de ${boats.availableRows} navires  + <a t:type="actionlink" t:id="exportShowBoats"> + <img src="${asset:context:}/img/file-export-22px.png" alt="Export CSV" + title="Exporter les ${boats.availableRows} navires avec leurs informations privées" /> + </a> + </h1> + <div t:type="grid" t:source="boats" t:row="boat" + t:include="name, immatriculation, districtCode, boatLength, buildYear" t:rowClass="prop:rowStyle" t:rowsPerPage="20"> + <p:nameCell> + <t:if t:test="canCreateNewContactFromList()"> + <a t:type="actionlink" t:id="addNewContactFromBoat" t:context="boat.immatriculation"> + <img src="${asset:context:}/img/contact-22px.png" title="Créer un nouveau contact pour ce navire et la ligne sélectionnée dans les filtres"/> + </a>  + </t:if> + <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> + </p:nameCell> + <p:boatLengthCell> + ${boat.boatLength} m + </p:boatLengthCell> + </div> + </div> + +  + <t:if t:test="boatSelectedImmatriculation"> + <t:zone t:id="boatInfosZone" t:update="show" class="fleft" id="so-boats-boat-infos"> + <t:unless t:test="activityCalendarImportRun"> +  + <t:if t:test="user.admin"> + <h2>Informations sur ${boatSelected.name}</h2> + <form t:type="form" t:id="companySelectForm" t:zone="so-boats-boat-infos"> + <t:label t:for="company" /> : + <input t:type="select" t:id="company" t:model="companies" t:value="companySelectedId" />  + <input t:type="submit" class="ico search" t:id="searchCompany" value="Search" /> + </form> + </t:if> +  + <t:if t:test="companyBoatInfos"> + <t:delegate to="activeBoatInfosBlock" /> + </t:if> +  + <fieldset id="so-boats-boat-infos-calendar"> + <legend>Calendrier d'activité</legend> + <p> + <t:if t:test="hasActivityCalendar()"> + <a t:type="actionlink" t:id="showLastActivityCalendar"> + <img src="${asset:context:}/img/calendar.png" title="Calendrier d'activité"/> + </a> + <p:else> + <img src="${asset:context:}/img/calendar-unavailable.png" title="Calendrier d'activité indisponible"/> + </p:else> + </t:if> + </p> + </fieldset> +  + <t:unless t:test="user.admin"> + <div id="so-boats-boat-infos-message"> + Les données saisies dans cette page sont la propriété exclusive de la société. <br /> + En dehors de la société, seul l'administrateur peut les consulter pour des questions de maintenance sur le site.<br /> + L'administrateur est une personne de l'Ifremer. + </div> + </t:unless> + <p:else> + <div class="fb-info"> + Le chargement des calendriers d'activité est en cours. <br /> + Vous ne pouvez pas accéder aux informations du navire pour l'instant. <br /> + Veuillez réessayer ultérieurement. + + </div> + </p:else> + </t:unless> + </t:zone> + +  + <t:block t:id="displayBoatInfos"> + +  + <t:unless t:test="user.admin"> + <div class="clearfix"> + <div class="fleft"> + <h2>Informations sur ${boatInfos.boat.name}</h2> + </div> +  + <t:if t:test="canEditBoatInfos()"> + <div class="fright"> + <a t:type="actionlink" t:id="editBoatInfos" t:zone="so-boats-boat-infos"> + <img src="${asset:context:}/img/edit-32px.png" title="Editer les informations"/> + </a> + </div> + </t:if> + </div> + </t:unless> + +  + <t:if t:test="companyBoatInfos.lastContact"> + <fieldset id="so-boats-boat-infos-lastcontact"> + <legend>Dernier contact avec le navire pour votre société</legend> + <div class="${lastContactStyle}"> + <dl t:type="beandisplay" t:id="boatInfosLastContact" t:object="companyBoatInfos.lastContact" + t:include="referenceDate, state" t:add="createdBy, sampleRowCode"> + <p:createdBy> + ${companyBoatInfos.lastContact.observer.fullName} + </p:createdBy> + <p:sampleRowCode> + ${companyBoatInfos.lastContact.sampleRow.code} + </p:sampleRowCode> + </dl> + </div> + </fieldset> + </t:if> +  + <fieldset id="so-boats-boat-infos-contact"> + <legend>Contact</legend> + <div t:type="beandisplay" t:id="boatInfosContact" t:object="boatInfos" + t:include="contactFirstName, contactLastName, contactPhoneNumber, contactEmail, + contactAddress1, contactAddress2, contactPostalCode, contactCity, contactSiret" /> + </fieldset> + + +  + <fieldset id="so-boats-boat-infos-boarding"> + <legend>Autres informations sur le navire</legend> + <div> + <p> + <label>${message:shipOwner-label} : </label> + ${boatInfos.boat.shipOwner.firstName} ${boatInfos.boat.shipOwner.lastName} + </p> + <p class="sep"> </p> + <p> + <label>${message:dup-label} : </label> + <t:if t:test="boatInfos.dup"> + ${boatInfos.dup} + <p:else>non renseigné</p:else> + </t:if> + </p> + <p class="sep"> </p> + <p> + <form t:type="form" t:id="calculateBoardings" t:zone="so-boats-boat-infos"> + <t:label t:for="fromDate"/> : + <input t:type="datefield" t:id="fromDate" class="width70" value="boardingFromDate" />  + <input t:type="submit" class="ico refresh" t:id="refreshBoardings" value="Refresh" title="Recalculer les embarquements"/> + </form> + </p> + <p> + <strong>${boatInfos.boat.getNbBoarding(boardingFromDate)}</strong> embarquement(s) + dont <strong>${boatInfos.getNbBoardingForCompany(boardingFromDate)}</strong> dans votre société + </p> + <t:if t:test="companyBoatInfos.elligibleBoatsValues.size()"> + <p class="sep"> </p> + <label>Ligne(s) du plan associée(s) à ce navire :</label> + <ul> + <li t:type="loop" t:source="companyBoatInfos.elligibleBoatsValues" t:value="elligibleBoat"> + <span t:type="ck/Tooltip" title="Infos" t:value="prop:elligibleRowInfos" t:effect="appear"> + <span class="${elligibleRowStyle}"> + ${elligibleBoat.sampleRow.code} + </span>  + </span> + <t:if t:test="canCreateNewContactFromElligibleBoat()"> + <a t:type="actionlink" t:id="addNewContactFromSampleRow" t:context="elligibleBoat.sampleRow.code"> + <img src="${asset:context:}/img/contact-22px.png" title="Créer un nouveau contact pour ce navire et cette ligne du plan"/> + </a> + <p:else> + <t:unless t:test="user.admin"> + <img src="${asset:context:}/img/contact-unavailable-22px.png" title="Création d'un nouveau contact impossible"/> + </t:unless> + </p:else> + </t:if> + </li> + </ul> + </t:if> + <t:if t:test="boatInfos.comment"> + <p class="sep"> </p> + <label>Commentaire : </label> + <p class="comment">${boatInfos.comment}</p> + </t:if> + </div> + </fieldset> + </t:block> + +  + <t:block t:id="editBoatInfos"> + <form t:type="form" t:id="boatInfosForm" t:zone="so-boats-boat-infos"> + <t:errors /> + +  + <div class="clearfix"> + <div class="fleft"> + <h2>Informations sur ${boatInfos.boat.name}</h2> + </div> +  + <t:if t:test="canEditBoatInfos()"> + <div class="fright"> + <input t:type="submit" t:id="saveBoatInfos" class="ico save" value="Save" + title="Enregistrer les modifications" />  + <a t:type="actionlink" t:id="cancelEditBoatInfos" t:zone="so-boats-boat-infos"> + <img src="${asset:context:}/img/undo.png" title="Annuler les modifications"/> + </a> + </div> + </t:if> + </div> + +  +  + <fieldset id="so-boats-boat-infos-contact"> + <legend>Contact</legend> + <div class="t-beaneditor"> + <t:beaneditor t:id="editBoatInfosContact" t:object="boatInfos" + t:include="contactFirstName, contactLastName, contactPhoneNumber, contactEmail, + contactAddress1, contactAddress2, contactPostalCode, contactCity, contactSiret" /> + </div> + </fieldset> + +  + <fieldset id="so-boats-boat-infos-boarding"> + <legend>Autres informations sur le navire</legend> + <div> + <p><t:label t:for="dup"/> : <input t:type="textfield" t:id="dup" class="dup" value="boatInfos.dup" /></p> + <p class="sep"> </p> + + <p class="sep"> </p> + <label>Ligne(s) du plan :</label> + <ul> + <li t:type="loop" t:source="companyBoatInfos.elligibleBoatsValues" volatile="true" t:value="elligibleBoat"> + <span t:type="ck/Tooltip" title="Infos" t:value="prop:elligibleRowInfos" t:effect="appear"> + <span class="${elligibleRowStyle}"> + ${elligibleBoat.sampleRow.code} + </span>  + </span> + <t:if t:test="elligibleBoatCompanyActiveFalse"> + <input t:type="submitContext" t:id="activeBoatInfosSampleRow" class="ico add" value="Active" + t:context="elligibleBoat.sampleRow.code" title="Réactiver cette ligne du plan" /> + <p:else> + <input t:type="submitContext" t:id="removeBoatInfosSampleRow" class="ico remove" value="Remove" + t:context="elligibleBoat.sampleRow.code" title="Dissocier le navire de cette ligne du plan" /> + </p:else> + </t:if> + </li> + </ul> + <p> + <input t:type="select" t:id="sampleRowSelect" t:model="sampleRowSelectModel" + t:value="boatInfosSampleRowId"/> + <input t:type="submit" t:id="addBoatInfosSampleRow" class="ico add" value="Add" + t:title="Associer à une ligne du plan" /> + </p> + <p class="sep"> </p> + <t:label t:for="comment"/> : + <p><input t:type="textarea" t:id="comment" cols="50" rows="5" value="boatInfos.comment"/></p> + </div> + </fieldset> + </form> + </t:block> + + </t:if> + </div> +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/Boats.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,310 +1,339 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Contacts" t:contentId="so-contacts" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - -<div id="so-contacts-search"> - <form t:type="form" t:id="searchBoat"> - <div> - <t:label t:for="boatName" /><br /> - <input t:type="textfield" class="width200" t:id="boatName" value="contactFilter.boatName" t:mixins="Autocomplete"/> - <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" title="Rechercher les contacts liés à ce navire" /> - </div> - </form> - <a t:type="actionlink" t:id="showFilters" t:zone="so-contacts-filters" class="display-form"> - recherche avancée - </a>  - <t:if t:test="canImportExport()"> - <a t:type="actionlink" t:id="showImportExport" t:zone="so-contacts-importexport" class="display-form"> - import/export - </a> - </t:if> - <t:if t:test="user.admin"> -   - <a t:type="actionlink" t:id="toggleDisplayMode" class="display-form"> - <t:if t:test="fullView"> - réduire la vue - <p:else> - agrandir la vue - </p:else> - </t:if> - </a> - </t:if> -</div> - -<div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters"> - <fieldset> - <legend>Recherche avancée</legend> - <div class="so-filters-form"> - <form t:type="form" t:id="filtersForm" t:zone="so-contacts-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div> - <t:label t:for="fromDate" />: - <input t:type="datefield" class="width70" t:id="fromDate" value="contactFilter.fromDate" />  - <t:if t:test="user.admin"> - <t:label t:for="company" />: - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" - title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  - </t:if> - <t:label t:for="observer" />: - <select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> - </div><p> </p> - <div> -  - <label>Navire </label> - <t:label t:for="boatImmatriculation" />: - <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="contactFilter.boatImmatriculation" />  - <t:label t:for="boatDistrictCode" />: - <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="contactFilter.boatDistrictCode" />  -  - <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" - title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  - <t:label t:for="sectorName" />: - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="contactFilter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" />  -  - <label>Observations: </label> - <input t:type="checkbox" t:id="mammalsObservation1" value="contactFilter.mammalsObservation" /> - <t:label t:for="mammalsObservation1"> - <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> - </t:label>  - <label>Captures acc.: </label> - <input t:type="checkbox" t:id="mammalsCapture1" value="contactFilter.mammalsCapture" /> - <t:label t:for="mammalsCapture1"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> - </t:label> - </div><p> </p> - <div> - <t:label t:for="state" />: - <select t:type="select" t:id="state" value="contactFilter.state"/>  - <label>Validation société: </label> - <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> - <t:label t:for="companyAccepted"> - <img src="${asset:context:img/true-22px.png}" title="Accepté par la société" /> - </t:label>  - <input t:type="checkbox" t:id="companyRefused" value="contactFilter.companyRefused" /> - <t:label t:for="companyRefused"> - <img src="${asset:context:img/false-22px.png}" title="Refusé par la société" /> - </t:label>  - <input t:type="checkbox" t:id="companyUndefined" value="contactFilter.companyUndefined" /> - <t:label t:for="companyUndefined"> - <img src="${asset:context:img/help-22px.png}" title="Non validé par la société" /> - </t:label> -  - <label>Validation programme: </label> - <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> - <t:label t:for="programAccepted"> - <img src="${asset:context:img/true-22px.png}" title="Accepté par le programme" /> - </t:label>  - <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> - <t:label t:for="programRefused"> - <img src="${asset:context:img/false-22px.png}" title="Refusé par le programme" /> - </t:label>  - <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> - <t:label t:for="programUndefined"> - <img src="${asset:context:img/help-22px.png}" title="Non validé par le programme" /> - </t:label> -  - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" />  - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> - </div> - </div> - </form> - </div> - </fieldset> -</div> - -<div t:type="zone" class="so-filters" t:id="importExportZone" t:update="show" t:visible="false" id="so-contacts-importexport"> - <fieldset> - <legend>Import/export CSV (UTF-8)</legend> - <form t:type="form" t:id="importContacts"> - <t:errors /> - <t:label for="contactsCsvFile" /> : - <input t:type="upload" t:id="contactsCsvFile" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" title="Importer une liste de contacts (format CSV avec encodage UTF-8)" /> - <a t:type="actionlink" t:id="exportShowContacts"> - <img src="${asset:context:img/file-export-22px.png}" alt="Export" - title="Exporter les ${contacts.availableRows} contacts trouvés ${tooltipExportFrom}" /> - </a> - </form> - </fieldset> -</div> - -<p> - <strong>${contacts.availableRows} contacts trouvés</strong> - <t:if t:test="contactFilter.fromDate"> - depuis le <t:output value="contactFilter.fromDate" format="dateFormat" /> - </t:if> -</p> -<t:zone t:id="gridZone"> - <form t:type="form" t:id="contactsForm" t:zone="gridZone"> - <t:errors id="so-contact-form-errors" t:banner="message:contactsForm-errors-banner"/> - <div t:type="grid" t:source="contacts" t:row="contact" class="t-data-grid ${gridClass}" t:model="contactModel" t:rowClass="prop:rowClass" - t:rowsPerPage="20"> - <p:createdByCell> - <t:if t:test="editionMode"> - <input t:type="select" t:model="userSelectModel" t:validate="required" t:value="contactUserId"/> - <p:else>${contact.observer.fullName}</p:else> - </t:if> - </p:createdByCell> - <p:sampleRowCell> - <span t:type="ck/Tooltip" title="Infos" t:value="prop:sampleRowDescription" t:effect="appear"> - ${contact.sampleRow.code} - </span> - </p:sampleRowCell> - <p:topiaCreateDateCell> - <t:output value="contact.topiaCreateDate" format="dateFormat" /> - </p:topiaCreateDateCell> - <p:boatCell> - <span t:type="ck/Tooltip" title="Infos" t:value="prop:boatDescription" t:effect="appear"> - ${contact.boat.name} - </span> - </p:boatCell> - <p:stateCell> - <t:if t:test="editionMode"> - <input t:type="select" t:id="contactState" t:value="contactEdited.contactState" t:validate="required"/> - <p:else>${contact.contactState.libelle()}</p:else> - </t:if> - </p:stateCell> - <p:tideBeginDateCell> - <t:if t:test="editionMode"> - <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.tideBeginDate" /> - <p:else><t:output value="contact.tideBeginDate" format="dateFormat" /></p:else> - </t:if> - </p:tideBeginDateCell> - <p:tideEndDateCell> - <t:if t:test="editionMode"> - <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.tideEndDate" /> - <p:else><t:output value="contact.tideEndDate" format="dateFormat" /></p:else> - </t:if> - </p:tideEndDateCell> - <p:nbObservantsCell> - <t:if t:test="editionMode"> - <input t:type="textfield" t:id="nbObservants" class="nbObservants" value="contactEdited.nbObservants" /> - <p:else>${contact.nbObservants}</p:else> - </t:if> - </p:nbObservantsCell> - <p:mammalsCell> - <t:if t:test="editionMode"> - <input t:type="checkbox" t:id="mammalsObservation" value="contactEdited.mammalsObservation"/> - <t:label t:for="mammalsObservation"> - <img src="${asset:context:img/eye-22px.png}" alt="Observations" - title="Observations" /> - </t:label>  - <input t:type="checkbox" t:id="mammalsCapture" value="contactEdited.mammalsCapture" /> - <t:label t:for="mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" - title="Captures" /> - </t:label> - <p:else> - <t:if t:test="contact.mammalsObservation"> - <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  - </t:if> - <t:if t:test="contact.mammalsCapture"> - <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> - </t:if> - </p:else> - </t:if> - </p:mammalsCell> - <p:validationCell> - <t:booleanImage t:value="contact.validationCompany" t:empty="isEmpty(contact.validationCompany)" - t:emptyTitle="Non validé par la société" - t:trueTitle="Validé par la société" t:falseTitle="Refusé par la société"/>  - <t:booleanImage t:value="contact.validationProgram" t:empty="isEmpty(contact.validationProgram)" - t:emptyTitle="Non validé par le programme" - t:trueTitle="Validé par le programme" t:falseTitle="Refusé par le programme"/> - </p:validationCell> - <p:dataInputDateCell> - <t:if t:test="editionMode"> - <input t:type="datefield" t:id="inputDate" class="date" value="contactEdited.dataInputDate" /> - <p:else><t:output value="contact.dataInputDate" format="dateFormat" /></p:else> - </t:if> - </p:dataInputDateCell> - <p:commentCell> - <t:if t:test="editionMode"> -  - <a href="#" onclick="openCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()})"> - <img src="${asset:context:img/comment-22px.png}" id="commentImg" alt="Add comment" /> - </a> -  - - <textarea t:type="textarea" t:id="comment" class="hidden contact-comment" value="contactEdited.comment" /> - - <div t:type="ck/Window" t:id="windowComment" show="false" modal="true" - title="literal:Ajouter un commentaire" width="500" height="215"> - <p> - <textarea id="commentPopup" cols="50" rows="7" /> - </p> - <p> </p> - <p class="aright"> - -   - </p> - </div> - - <p:else> - <t:if t:test="contact.comment"> - <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:commentTooltip" t:effect="appear"> - ${commentDisplayed} - </span> - </t:if> - </p:else> - </t:if> - </p:commentCell> - <p:actionsCell> - <t:if t:test="hasActions()"> - <t:if t:test="editionMode"> - <input t:type="submit" t:id="cancelEditContact" class="ico22px undo22px" value="Undo" - title="Annuler les modifications" /> - <input t:type="submitContext" t:id="saveContact" class="ico22px save22px" value="Save" - t:context="contact.topiaId" title="Enregistrer le contact" /> - <p:else> - <input t:type="submitContext" t:id="editContact" class="ico edit" value="Edit" - t:context="contact.topiaId" title="Modifier le contact" /> - <input t:type="submitContext" t:id="deleteContact" class="ico22px delete" value="Delete" - t:context="contact.topiaId" title="Supprimer le contact" - t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement ce contact ?" /> - </p:else> - </t:if> - <p:else> - <t:unless t:test="user.admin"> - <img src="${asset:context:img/edit-unavailable-22px.png}" alt="Edit unavailable" title="Edition du contact indisponible"/> - <img src="${asset:context:img/delete-unavailable-22px.png}" alt="Delete unavailable" title="Suppression du contact indisponible"/> - </t:unless> - </p:else> - </t:if> - <t:if t:test="hasValidationActions()"> - <t:if t:test="canValidate()"> - <input t:type="submitContext" t:id="acceptContact" class="ico22px accept" value="Accept" - t:context="contact.topiaId" title="Valider le contact" /> - <input t:type="submitContext" t:id="refuseContact" class="ico22px refuse" value="Refuse" - t:context="contact.topiaId" title="Refuser le contact" /> - <p:else> - <t:unless t:test="canUnvalidate()"> - <img src="${asset:context:img/accept-unavailable-22px.png}" alt="Accept unavailable" title="Validation du contact indisponible"/> - <img src="${asset:context:img/refuse-unavailable-22px.png}" alt="Refuse unavailable" title="Refus du contact indisponible"/> - </t:unless> - </p:else> - </t:if> - <t:if t:test="canUnvalidate()"> - <input t:type="submitContext" t:id="unvalidateContact" class="ico22px unvalidate" value="Unvalidate" - t:context="contact.topiaId" title="Enlever la validation du contact" /> - </t:if> - </t:if> - </p:actionsCell> - </div> - </form> -</t:zone> - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Contacts" t:contentId="so-contacts" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + +<div id="so-contacts-search"> + <form t:type="form" t:id="searchBoat"> + <div> + <t:label t:for="boatName" /><br /> + <input t:type="textfield" class="width200" t:id="boatName" value="contactFilter.boatName" t:mixins="Autocomplete"/> + <input t:type="submit" class="ico search-32px" t:id="execSearchBoat" value="Search" title="Rechercher les contacts liés à ce navire" /> + </div> + </form> + <a t:type="actionlink" t:id="showFilters" t:zone="so-contacts-filters" class="display-form"> + recherche avancée + </a>  + <t:if t:test="canImportExport()"> + <a t:type="actionlink" t:id="showImportExport" t:zone="so-contacts-importexport" class="display-form"> + import/export + </a> + </t:if> + <t:if t:test="user.admin"> +   + <a t:type="actionlink" t:id="toggleDisplayMode" class="display-form"> + <t:if t:test="fullView"> + réduire la vue + <p:else> + agrandir la vue + </p:else> + </t:if> + </a> + </t:if> +</div> + +<div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters"> + <fieldset> + <legend>Recherche avancée</legend> + <div class="so-filters-form"> + <form t:type="form" t:id="filtersForm" t:zone="so-contacts-filters"> + <t:errors /> + <div class="t-beaneditor"> + <div> + <t:label t:for="fromDate" />: + <input t:type="datefield" class="width70" t:id="fromDate" value="contactFilter.fromDate" />  + <t:if t:test="user.admin"> + <t:label t:for="company" />: + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  + <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" + title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  + </t:if> + <t:label t:for="observer" />: + <select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /> + </div><p> </p> + <div> +  + <label>Navire </label> + <t:label t:for="boatImmatriculation" />: + <input t:type="textfield" t:id="boatImmatriculation" class="width50" t:value="contactFilter.boatImmatriculation" />  + <t:label t:for="boatDistrictCode" />: + <input t:type="textfield" t:id="boatDistrictCode" class="width50" t:value="contactFilter.boatDistrictCode" />  +  + <t:label t:for="facadeName" />: + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="contactFilter.facadeName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" + title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  + <t:label t:for="sectorName" />: + <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="contactFilter.sectorName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" + title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  + <t:label t:for="sampleRow" />: + <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" />  +  + <label>Observations: </label> + <input t:type="checkbox" t:id="mammalsObservation1" value="contactFilter.mammalsObservation" /> + <t:label t:for="mammalsObservation1"> + <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> + </t:label>  + <label>Captures acc.: </label> + <input t:type="checkbox" t:id="mammalsCapture1" value="contactFilter.mammalsCapture" /> + <t:label t:for="mammalsCapture1"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> + </t:label> + </div><p> </p> + <div> + <t:label t:for="state" />: + <select t:type="select" t:id="state" value="contactFilter.state"/>  + <label>Validation société: </label> + <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> + <t:label t:for="companyAccepted"> + <img src="${asset:context:img/true-22px.png}" title="Accepté par la société" /> + </t:label>  + <input t:type="checkbox" t:id="companyRefused" value="contactFilter.companyRefused" /> + <t:label t:for="companyRefused"> + <img src="${asset:context:img/false-22px.png}" title="Refusé par la société" /> + </t:label>  + <input t:type="checkbox" t:id="companyUndefined" value="contactFilter.companyUndefined" /> + <t:label t:for="companyUndefined"> + <img src="${asset:context:img/help-22px.png}" title="Non validé par la société" /> + </t:label> +  + <label>Validation programme: </label> + <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> + <t:label t:for="programAccepted"> + <img src="${asset:context:img/true-22px.png}" title="Accepté par le programme" /> + </t:label>  + <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> + <t:label t:for="programRefused"> + <img src="${asset:context:img/false-22px.png}" title="Refusé par le programme" /> + </t:label>  + <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> + <t:label t:for="programUndefined"> + <img src="${asset:context:img/help-22px.png}" title="Non validé par le programme" /> + </t:label> +  + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les contacts correspondants aux filtres saisies" />  + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> + </div> + </div> + </form> + </div> + </fieldset> +</div> + +<div t:type="zone" class="so-filters" t:id="importExportZone" t:update="show" t:visible="false" id="so-contacts-importexport"> + <fieldset> + <legend>Import/export CSV (UTF-8)</legend> + <form t:type="form" t:id="importContacts"> + <t:errors /> + <t:label for="contactsCsvFile" /> : + <input t:type="upload" t:id="contactsCsvFile" t:validate="required" /> + <input t:type="submit" class="ico import" value="OK" title="Importer une liste de contacts (format CSV avec encodage UTF-8)" /> + <a t:type="actionlink" t:id="exportShowContacts"> + <img src="${asset:context:img/file-export-22px.png}" alt="Export" + title="Exporter les ${contacts.availableRows} contacts trouvés ${tooltipExportFrom}" /> + </a> + </form> + </fieldset> +</div> + +<p> + <strong>${contacts.availableRows} contacts trouvés</strong> + <t:if t:test="contactFilter.fromDate"> + depuis le <t:output value="contactFilter.fromDate" format="dateFormat" /> + </t:if> +</p> +<t:zone t:id="gridZone"> + <form t:type="form" t:id="contactsForm" t:zone="gridZone"> + <t:errors id="so-contact-form-errors" t:banner="message:contactsForm-errors-banner"/> + <div t:type="grid" t:source="contacts" t:row="contact" class="t-data-grid ${gridClass}" t:model="contactModel" t:rowClass="prop:rowClass" + t:rowsPerPage="20"> + <p:createdByCell> + <t:if t:test="editionMode"> + <input t:type="select" t:model="userSelectModel" t:validate="required" t:value="contactUserId"/> + <p:else>${contact.observer.fullName}</p:else> + </t:if> + </p:createdByCell> + <p:sampleRowCell> + <span t:type="ck/Tooltip" title="Infos" t:value="prop:sampleRowDescription" t:effect="appear"> + ${contact.sampleRow.code} + </span> + </p:sampleRowCell> + <p:topiaCreateDateCell> + <t:output value="contact.topiaCreateDate" format="dateFormat" /> + </p:topiaCreateDateCell> + <p:boatCell> + <span t:type="ck/Tooltip" title="Infos" t:value="prop:boatDescription" t:effect="appear"> + ${contact.boat.name} + </span> + </p:boatCell> + <p:stateCell> + <t:if t:test="editionMode"> + <input t:type="select" t:id="contactState" t:value="contactEdited.contactState" t:validate="required"/> + <p:else>${contact.contactState.libelle()}</p:else> + </t:if> + </p:stateCell> + <p:tideBeginDateCell> + <t:if t:test="editionMode"> + <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.tideBeginDate" /> + <p:else><t:output value="contact.tideBeginDate" format="dateFormat" /></p:else> + </t:if> + </p:tideBeginDateCell> + <p:tideEndDateCell> + <t:if t:test="editionMode"> + <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.tideEndDate" /> + <p:else><t:output value="contact.tideEndDate" format="dateFormat" /></p:else> + </t:if> + </p:tideEndDateCell> + <p:nbObservantsCell> + <t:if t:test="editionMode"> + <input t:type="textfield" t:id="nbObservants" class="nbObservants" value="contactEdited.nbObservants" /> + <p:else>${contact.nbObservants}</p:else> + </t:if> + </p:nbObservantsCell> + <p:mammalsCell> + <t:if t:test="editionMode"> + <input t:type="checkbox" t:id="mammalsObservation" value="contactEdited.mammalsObservation"/> + <t:label t:for="mammalsObservation"> + <img src="${asset:context:img/eye-22px.png}" alt="Observations" + title="Observations" /> + </t:label>  + <input t:type="checkbox" t:id="mammalsCapture" value="contactEdited.mammalsCapture" /> + <t:label t:for="mammalsCapture"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" + title="Captures" /> + </t:label> + <p:else> + <t:if t:test="contact.mammalsObservation"> + <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  + </t:if> + <t:if t:test="contact.mammalsCapture"> + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> + </t:if> + </p:else> + </t:if> + </p:mammalsCell> + <p:validationCell> + <t:booleanImage t:value="contact.validationCompany" t:empty="isEmpty(contact.validationCompany)" + t:emptyTitle="Non validé par la société" + t:trueTitle="Validé par la société" t:falseTitle="Refusé par la société"/>  + <t:booleanImage t:value="contact.validationProgram" t:empty="isEmpty(contact.validationProgram)" + t:emptyTitle="Non validé par le programme" + t:trueTitle="Validé par le programme" t:falseTitle="Refusé par le programme"/> + </p:validationCell> + <p:dataInputDateCell> + <t:if t:test="editionMode"> + <input t:type="datefield" t:id="inputDate" class="date" value="contactEdited.dataInputDate" /> + <p:else><t:output value="contact.dataInputDate" format="dateFormat" /></p:else> + </t:if> + </p:dataInputDateCell> + <p:commentCell> + <t:if t:test="editionMode"> +  + <a href="#" onclick="openCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()})"> + <img src="${asset:context:img/comment-22px.png}" id="commentImg" alt="Add comment" /> + </a> +  + + <textarea t:type="textarea" t:id="comment" class="hidden contact-comment" value="contactEdited.comment" /> + + <div t:type="ck/Window" t:id="windowComment" show="false" modal="true" + title="literal:Ajouter un commentaire" width="500" height="215"> + <p> + <textarea id="commentPopup" cols="50" rows="7" /> + </p> + <p> </p> + <p class="aright"> + +   + </p> + </div> + + <p:else> + <t:if t:test="contact.comment"> + <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:commentTooltip" t:effect="appear"> + ${commentDisplayed} + </span> + </t:if> + </p:else> + </t:if> + </p:commentCell> + <p:actionsCell> + <t:if t:test="hasActions()"> + <t:if t:test="editionMode"> + <input t:type="submit" t:id="cancelEditContact" class="ico22px undo22px" value="Undo" + title="Annuler les modifications" /> + <input t:type="submitContext" t:id="saveContact" class="ico22px save22px" value="Save" + t:context="contact.topiaId" title="Enregistrer le contact" /> + <p:else> + <input t:type="submitContext" t:id="editContact" class="ico edit" value="Edit" + t:context="contact.topiaId" title="Modifier le contact" /> + <input t:type="submitContext" t:id="deleteContact" class="ico22px delete" value="Delete" + t:context="contact.topiaId" title="Supprimer le contact" + t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement ce contact ?" /> + </p:else> + </t:if> + <p:else> + <t:unless t:test="user.admin"> + <img src="${asset:context:img/edit-unavailable-22px.png}" alt="Edit unavailable" title="Edition du contact indisponible"/> + <img src="${asset:context:img/delete-unavailable-22px.png}" alt="Delete unavailable" title="Suppression du contact indisponible"/> + </t:unless> + </p:else> + </t:if> + <t:if t:test="hasValidationActions()"> + <t:if t:test="canValidate()"> + <input t:type="submitContext" t:id="acceptContact" class="ico22px accept" value="Accept" + t:context="contact.topiaId" title="Valider le contact" /> + <input t:type="submitContext" t:id="refuseContact" class="ico22px refuse" value="Refuse" + t:context="contact.topiaId" title="Refuser le contact" /> + <p:else> + <t:unless t:test="canUnvalidate()"> + <img src="${asset:context:img/accept-unavailable-22px.png}" alt="Accept unavailable" title="Validation du contact indisponible"/> + <img src="${asset:context:img/refuse-unavailable-22px.png}" alt="Refuse unavailable" title="Refus du contact indisponible"/> + </t:unless> + </p:else> + </t:if> + <t:if t:test="canUnvalidate()"> + <input t:type="submitContext" t:id="unvalidateContact" class="ico22px unvalidate" value="Unvalidate" + t:context="contact.topiaId" title="Enlever la validation du contact" /> + </t:if> + </t:if> + </p:actionsCell> + </div> + </form> +</t:zone> + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/Contacts.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/ExceptionReport.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ExceptionReport.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/ExceptionReport.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,15 +1,44 @@ -<t:layout t:pageTitle="Erreur" t:contentId="so-exception-report" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"> - -</t:layout> - - +<?xml version="1.0" encoding="UTF-8"?> + + +<t:layout t:pageTitle="Erreur" t:contentId="so-exception-report" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"> + +</t:layout> + + Property changes on: trunk/wao-ui/src/main/webapp/ExceptionReport.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,65 +1,94 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="News" t:contentId="so-news" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <form t:type="form" t:id="newsForm"> - <t:if t:test="canEditNews()"> - <p class="aright"> - <a t:type="actionlink" t:id="addNews"> - <img src="${asset:context:img/add-32px.png}" alt="Ajouter" title="Ajouter un nouvel article"/> - </a> - </p> - </t:if> - <t:loop t:source="newsList" value="news" t:index="rowIndex" t:volatile="true"> - <div class="item" > - <p class="date"> - <t:unless t:test="createMode"> - Publiée le <t:output value="news.topiaCreateDate" format="dateFormat" /> - <p:else> - En cours de création... - </p:else> - </t:unless> - </p> - <h2> - <t:if t:test="editionMode"> - <t:label t:for="title" /> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> - <p:else> - ${news.title} - </p:else> - </t:if> - </h2> - <t:if t:test="canEditNews()"> - <p class="aright"> - <t:if t:test="editionMode"> - <input t:type="submitContext" t:context="rowIndex" t:id="saveNews" class="ico22px save22px" value="Save" - title="Enregistrer les modifications" />  - <a t:type="actionlink" t:id="cancelEdit"> - <img src="${asset:context:img/undo-22px.png}" title="Annuler les modifications"/> - </a> - <p:else> - <a t:type="actionlink" t:id="editNews" t:context="rowIndex" title="Modifier l'article"> - <img src="${asset:context:img/edit.png}" alt="Edit" /> - </a>  - <a t:type="actionlink" t:id="deleteNews" t:context="rowIndex" title="Supprimer l'article" - t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet article ?"> - <img src="${asset:context:img/delete2.png}" alt="Delete" /> - </a> - </p:else> - </t:if> - </p> - </t:if> - <div class="content"> - <t:if t:test="editionMode"> - <t:label t:for="content" /><br /> -  - <textarea t:type="easyfck/fckeditor" t:id="content" width="800px" height="200px" value="news.content" t:configuration="fckconf" t:validate="required" /> - <p:else> - <t:outputraw t:value="news.content"/> - </p:else> - </t:if> - </div> - </div> - <div class="sep"><hr /></div> - </t:loop> - </form> - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="News" t:contentId="so-news" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <form t:type="form" t:id="newsForm"> + <t:if t:test="canEditNews()"> + <p class="aright"> + <a t:type="actionlink" t:id="addNews"> + <img src="${asset:context:img/add-32px.png}" alt="Ajouter" title="Ajouter un nouvel article"/> + </a> + </p> + </t:if> + <t:loop t:source="newsList" value="news" t:index="rowIndex" t:volatile="true"> + <div class="item" > + <p class="date"> + <t:unless t:test="createMode"> + Publiée le <t:output value="news.topiaCreateDate" format="dateFormat" /> + <p:else> + En cours de création... + </p:else> + </t:unless> + </p> + <h2> + <t:if t:test="editionMode"> + <t:label t:for="title" /> : <input t:type="textfield" t:id="title" value="news.title" class="width200" t:validate="required"/> + <p:else> + ${news.title} + </p:else> + </t:if> + </h2> + <t:if t:test="canEditNews()"> + <p class="aright"> + <t:if t:test="editionMode"> + <input t:type="submitContext" t:context="rowIndex" t:id="saveNews" class="ico22px save22px" value="Save" + title="Enregistrer les modifications" />  + <a t:type="actionlink" t:id="cancelEdit"> + <img src="${asset:context:img/undo-22px.png}" title="Annuler les modifications"/> + </a> + <p:else> + <a t:type="actionlink" t:id="editNews" t:context="rowIndex" title="Modifier l'article"> + <img src="${asset:context:img/edit.png}" alt="Edit" /> + </a>  + <a t:type="actionlink" t:id="deleteNews" t:context="rowIndex" title="Supprimer l'article" + t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet article ?"> + <img src="${asset:context:img/delete2.png}" alt="Delete" /> + </a> + </p:else> + </t:if> + </p> + </t:if> + <div class="content"> + <t:if t:test="editionMode"> + <t:label t:for="content" /><br /> +  + <textarea t:type="easyfck/fckeditor" t:id="content" width="800px" height="200px" value="news.content" t:configuration="fckconf" t:validate="required" /> + <p:else> + <t:outputraw t:value="news.content"/> + </p:else> + </t:if> + </div> + </div> + <div class="sep"><hr /></div> + </t:loop> + </form> + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/Index.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,188 +1,217 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Modification d'une ligne du plan" t:contentId="so-samplerow-form" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <h1> - <t:if t:test="createMode"> - Création d'une nouvelle ligne - <p:else> - Modification de la ligne ${sampleRow.code} - </p:else> - </t:if> - </h1> - <t:zone t:id="globalZone" t:update="show"> - <form t:type="form" t:id="sampleRowForm" t:zone="globalZone"> - -  - <fieldset> - <legend>Métier</legend> - <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> -  - <t:beandisplay t:id="professionDisplay" t:model="professionModel" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> - <p:else> -  - <div class="select"> - <t:label t:for="professionSelect" /> : - <input t:type="select" t:id="professionSelect" t:model="professionSelectModel" - t:value="professionId" />  - <input t:type="submit" class="ico add" t:id="addNewProfession" value="Add" - title="Créer un nouveau métier à partir de celui sélectionné"/> - </div> - <div class="t-beaneditor"> - <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" - t:include="codeDCF5, meshSize, size, other, libelle, species" /> - </div> - </p:else> - </t:if> - </fieldset> - -  - <fieldset id="so-samplerow-form-fishingzone"> - <legend>Zone(s) de pêche</legend> - <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> -  - <ul> - <li t:type="loop" t:source="fishingZones" t:volatile="true" t:value="fishingZone"> - ${fishingZone.code} - </li> - </ul> - <p:else> -  - <div class="select"> - <t:label t:for="fishingZoneSelect" />* : - <input t:type="select" t:id="fishingZoneSelect" t:model="fishingZoneSelectModel" - t:value="fishingZoneId" />  - <input t:type="submit" class="ico add" t:id="addFishingZone" value="Add" - title="Ajouter la zone sélectionnée à la ligne d'échantillonnage" /> - </div> - <div class="clearfix fishingzone-row" t:type="loop" volatile="true" t:source="fishingZones" - t:value="fishingZone" t:index="indexFishingZone"> - <div class="fleft width50"> - <input t:type="submitContext" class="ico remove" t:context="indexFishingZone" - t:id="removeFishingZone" value="Remove" title="Retirer cette zone de la liste liée à la ligne d'échantillonnage"/> - </div> - <div class="fleft"> - ${fishingZone.code} - </div> - </div> - </p:else> - </t:if> - <div class="t-beaneditor-row"> - <t:label t:for="fishingZonesInfos" /> - <input t:type="textfield" class="width300" t:id="fishingZonesInfos" value="sampleRow.fishingZonesInfos" /> - </div> - </fieldset> - -  - <fieldset> - <legend>Programme de rattachement et effort d'observation par mois</legend> - <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> -  - <dl class="t-beandisplay"> - <dt>Programme</dt> - <dd>${sampleRow.programName}</dd> - </dl> - <p:else> -  - <div class="select"> - <t:label t:for="program"/>* : - <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />  -  - ou <input t:type="textfield" t:id="programName" value="programName" /> - </div> - </p:else> - </t:if> -  - <div class="select"> - <t:label t:for="programPeriodBegin"/>* : - du <input t:type="datefield" t:id="programPeriodBegin" value="period.fromDate" /> - jusqu'au <input t:type="datefield" t:id="programPeriodEnd" value="period.thruDate" />  - <input t:type="submit" class="ico refresh" t:id="refreshMonths" value="Refresh" title="Rafraîchir les mois"/> - </div> -  - <div id="so-samplerow-form-months" class="acenter"> - <table> - <tr class="firstRow"> - <td t:type="loop" class="acenter" volatile="true" t:source="sampleMonths" t:value="sampleMonth" t:index="monthIndex"> - <t:output value="sampleMonth.periodDate" format="dateFormat" /> - <t:unless t:test="sampleMonth.realTidesValue"> - <input t:type="submitContext" class="ico16px suppr" t:id="deleteMonth" value="Delete" t:context="monthIndex" - title="Supprimer ce mois"/> - <p:else> - <img src="${asset:context:}/img/suppr-unavailable-16px.png" alt="Supprimer" - title="Suppression indisponible en raison de données réels existantes" /> - </p:else> - </t:unless> - </td> - - </tr> - <tr> - <td t:type="loop" class="acenter" volatile="true" t:source="sampleMonths" t:value="sampleMonth"> - <input t:type="textfield" class="width40${monthStyle}" t:id="sampleMonth" value="sampleMonth.expectedTidesValue" /> - </td> - </tr> - </table> - </div> - </fieldset> -  - <fieldset id="so-samplerow-form-other"> - <legend>Autres données de la ligne d'échantillonnage</legend> - <div class="t-beaneditor"> - <t:beaneditor t:id="sampleRowEditor" t:object="sampleRow" t:model="sampleRowModel"> - <p:code> - <label>${message:code-label}</label> -  - <t:if t:test="sampleRow.code"> - <strong>${sampleRow.code}</strong> - <p:else> - <span class="code-missing"> - Date de début manquante pour générer le code de la ligne ! - </span> - </p:else> - </t:if> - </p:code> - <p:company> - <t:label t:for="company" /> - <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> - ${sampleRow.company.name} - <p:else> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> - </p:else> - </t:if> - </p:company> - <p:boats> - <t:label t:for="boats" /> - <input t:type="textarea" t:id="boats" cols="40" rows="2" value="immatriculations" /> - <span t:type="ck/Tooltip" title="Aide" t:value="Ce champs correspond aux immatriculations - des navires qui sont éligibles pour cette ligne. - Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne)" t:effect="appear"> - <img src="${asset:context:}/img/help-22px.png" alt="Aide" /> - </span> - </p:boats> - <p:comment> - <t:label t:for="comment" /> - <input t:type="textarea" t:id="comment" cols="40" rows="3" value="sampleRow.comment" /> - </p:comment> - </t:beaneditor> - </div> - </fieldset> - <fieldset class="clearfix"> - <t:errors t:banner="message:errors-banner"/> - <p><label>Enregistrement fait par : </label>${sampleRowLog.author.fullName}</p> - <t:unless t:test="createMode"> - <p><label>Commentaire sur la modification* :</label></p> - <p><input t:type="textarea" t:id="updateComment" cols="50" rows="5" value="sampleRowLog.comment"/></p> - </t:unless> - <div class="fright"> - <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> - <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> - </div> - </fieldset> - - </form> - </t:zone> - -</t:layout> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Modification d'une ligne du plan" t:contentId="so-samplerow-form" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <h1> + <t:if t:test="createMode"> + Création d'une nouvelle ligne + <p:else> + Modification de la ligne ${sampleRow.code} + </p:else> + </t:if> + </h1> + <t:zone t:id="globalZone" t:update="show"> + <form t:type="form" t:id="sampleRowForm" t:zone="globalZone"> + +  + <fieldset> + <legend>Métier</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + <t:beandisplay t:id="professionDisplay" t:model="professionModel" t:object="sampleRow.profession" + t:include="codeDCF5, meshSize, size, other, libelle, species" /> + <p:else> +  + <div class="select"> + <t:label t:for="professionSelect" /> : + <input t:type="select" t:id="professionSelect" t:model="professionSelectModel" + t:value="professionId" />  + <input t:type="submit" class="ico add" t:id="addNewProfession" value="Add" + title="Créer un nouveau métier à partir de celui sélectionné"/> + </div> + <div class="t-beaneditor"> + <t:beaneditor t:id="professionEditor" t:object="sampleRow.profession" + t:include="codeDCF5, meshSize, size, other, libelle, species" /> + </div> + </p:else> + </t:if> + </fieldset> + +  + <fieldset id="so-samplerow-form-fishingzone"> + <legend>Zone(s) de pêche</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + <ul> + <li t:type="loop" t:source="fishingZones" t:volatile="true" t:value="fishingZone"> + ${fishingZone.code} + </li> + </ul> + <p:else> +  + <div class="select"> + <t:label t:for="fishingZoneSelect" />* : + <input t:type="select" t:id="fishingZoneSelect" t:model="fishingZoneSelectModel" + t:value="fishingZoneId" />  + <input t:type="submit" class="ico add" t:id="addFishingZone" value="Add" + title="Ajouter la zone sélectionnée à la ligne d'échantillonnage" /> + </div> + <div class="clearfix fishingzone-row" t:type="loop" volatile="true" t:source="fishingZones" + t:value="fishingZone" t:index="indexFishingZone"> + <div class="fleft width50"> + <input t:type="submitContext" class="ico remove" t:context="indexFishingZone" + t:id="removeFishingZone" value="Remove" title="Retirer cette zone de la liste liée à la ligne d'échantillonnage"/> + </div> + <div class="fleft"> + ${fishingZone.code} + </div> + </div> + </p:else> + </t:if> + <div class="t-beaneditor-row"> + <t:label t:for="fishingZonesInfos" /> + <input t:type="textfield" class="width300" t:id="fishingZonesInfos" value="sampleRow.fishingZonesInfos" /> + </div> + </fieldset> + +  + <fieldset> + <legend>Programme de rattachement et effort d'observation par mois</legend> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> +  + <dl class="t-beandisplay"> + <dt>Programme</dt> + <dd>${sampleRow.programName}</dd> + </dl> + <p:else> +  + <div class="select"> + <t:label t:for="program"/>* : + <input t:type="select" t:id="program" t:model="programSelectModel" value="programId" />  +  + ou <input t:type="textfield" t:id="programName" value="programName" /> + </div> + </p:else> + </t:if> +  + <div class="select"> + <t:label t:for="programPeriodBegin"/>* : + du <input t:type="datefield" t:id="programPeriodBegin" value="period.fromDate" /> + jusqu'au <input t:type="datefield" t:id="programPeriodEnd" value="period.thruDate" />  + <input t:type="submit" class="ico refresh" t:id="refreshMonths" value="Refresh" title="Rafraîchir les mois"/> + </div> +  + <div id="so-samplerow-form-months" class="acenter"> + <table> + <tr class="firstRow"> + <td t:type="loop" class="acenter" volatile="true" t:source="sampleMonths" t:value="sampleMonth" t:index="monthIndex"> + <t:output value="sampleMonth.periodDate" format="dateFormat" /> + <t:unless t:test="sampleMonth.realTidesValue"> + <input t:type="submitContext" class="ico16px suppr" t:id="deleteMonth" value="Delete" t:context="monthIndex" + title="Supprimer ce mois"/> + <p:else> + <img src="${asset:context:}/img/suppr-unavailable-16px.png" alt="Supprimer" + title="Suppression indisponible en raison de données réels existantes" /> + </p:else> + </t:unless> + </td> + + </tr> + <tr> + <td t:type="loop" class="acenter" volatile="true" t:source="sampleMonths" t:value="sampleMonth"> + <input t:type="textfield" class="width40${monthStyle}" t:id="sampleMonth" value="sampleMonth.expectedTidesValue" /> + </td> + </tr> + </table> + </div> + </fieldset> +  + <fieldset id="so-samplerow-form-other"> + <legend>Autres données de la ligne d'échantillonnage</legend> + <div class="t-beaneditor"> + <t:beaneditor t:id="sampleRowEditor" t:object="sampleRow" t:model="sampleRowModel"> + <p:code> + <label>${message:code-label}</label> +  + <t:if t:test="sampleRow.code"> + <strong>${sampleRow.code}</strong> + <p:else> + <span class="code-missing"> + Date de début manquante pour générer le code de la ligne ! + </span> + </p:else> + </t:if> + </p:code> + <p:company> + <t:label t:for="company" /> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> + ${sampleRow.company.name} + <p:else> + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + </p:else> + </t:if> + </p:company> + <p:boats> + <t:label t:for="boats" /> + <input t:type="textarea" t:id="boats" cols="40" rows="2" value="immatriculations" /> + <span t:type="ck/Tooltip" title="Aide" t:value="Ce champs correspond aux immatriculations + des navires qui sont éligibles pour cette ligne. + Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne)" t:effect="appear"> + <img src="${asset:context:}/img/help-22px.png" alt="Aide" /> + </span> + </p:boats> + <p:comment> + <t:label t:for="comment" /> + <input t:type="textarea" t:id="comment" cols="40" rows="3" value="sampleRow.comment" /> + </p:comment> + </t:beaneditor> + </div> + </fieldset> + <fieldset class="clearfix"> + <t:errors t:banner="message:errors-banner"/> + <p><label>Enregistrement fait par : </label>${sampleRowLog.author.fullName}</p> + <t:unless t:test="createMode"> + <p><label>Commentaire sur la modification* :</label></p> + <p><input t:type="textarea" t:id="updateComment" cols="50" rows="5" value="sampleRowLog.comment"/></p> + </t:unless> + <div class="fright"> + <input t:type="submit" t:id="saveData" class="ico save" value="Save" title="Enregistrer les modifications" /> + <input t:type="submit" t:id="cancelSave" class="ico undo" value="Undo" title="Annuler les modifications" /> + </div> + </fieldset> + + </form> + </t:zone> + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/SampleRowForm.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,43 +1,72 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Historique d'une ligne du plan" t:contentId="so-samplerow-historic" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <h1>Historique de la ligne ${sampleRow.code}</h1> - <p class="aright">créée le <t:output t:format="dateFormat" t:value="sampleRow.topiaCreateDate"/></p> - <hr /> - <t:if t:test="canAddComment()"> - <form t:type="form" t:id="addComment" class="comment-form" action="post"> - <fieldset> - <legend>Ajouter un commentaire</legend> - <t:feedback t:id="addCommentInfo" /> - <p>Auteur : ${newLog.author.fullName}</p> - <p><label t:type="label" for="newComment">Commentaire</label> :</p> - <p> - <textarea t:type="textarea" t:id="newComment" t:value="newLog.comment" cols="90" rows="3" t:validate="required"> - ${newLog.comment} - </textarea> - </p> - <p class="aright"><input type="submit" t:type="submit" class="ico save" value="Save" title="Ajouter un nouveau commentaire" /></p> - </fieldset> - </form> - </t:if> - <div class="so-samplerow-log" t:type="loop" t:source="sampleRow.sampleRowLog" t:value="sampleRowLog"> - <p class="head-${sampleRowLog.author.userRole.name()}"> - <t:if t:test="sampleRowLog.author.admin"> - Modification du - <p:else>Commentaire ajouté le</p:else> - </t:if> - <strong><t:output t:format="dateFormat" t:value="sampleRowLog.topiaCreateDate"/></strong> - par <strong>${sampleRowLog.author.fullName}</strong> - </p> - <t:if t:test="sampleRowLog.logText"> - <p class="content"><t:outputraw value="content"/></p> - <p>Commentaire : </p> - </t:if> - <p class="comment"> - ${sampleRowLog.comment} - </p> - <hr /> - </div> - - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Historique d'une ligne du plan" t:contentId="so-samplerow-historic" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <h1>Historique de la ligne ${sampleRow.code}</h1> + <p class="aright">créée le <t:output t:format="dateFormat" t:value="sampleRow.topiaCreateDate"/></p> + <hr /> + <t:if t:test="canAddComment()"> + <form t:type="form" t:id="addComment" class="comment-form" action="post"> + <fieldset> + <legend>Ajouter un commentaire</legend> + <t:feedback t:id="addCommentInfo" /> + <p>Auteur : ${newLog.author.fullName}</p> + <p><label t:type="label" for="newComment">Commentaire</label> :</p> + <p> + <textarea t:type="textarea" t:id="newComment" t:value="newLog.comment" cols="90" rows="3" t:validate="required"> + ${newLog.comment} + </textarea> + </p> + <p class="aright"><input type="submit" t:type="submit" class="ico save" value="Save" title="Ajouter un nouveau commentaire" /></p> + </fieldset> + </form> + </t:if> + <div class="so-samplerow-log" t:type="loop" t:source="sampleRow.sampleRowLog" t:value="sampleRowLog"> + <p class="head-${sampleRowLog.author.userRole.name()}"> + <t:if t:test="sampleRowLog.author.admin"> + Modification du + <p:else>Commentaire ajouté le</p:else> + </t:if> + <strong><t:output t:format="dateFormat" t:value="sampleRowLog.topiaCreateDate"/></strong> + par <strong>${sampleRowLog.author.fullName}</strong> + </p> + <t:if t:test="sampleRowLog.logText"> + <p class="content"><t:outputraw value="content"/></p> + <p>Commentaire : </p> + </t:if> + <p class="comment"> + ${sampleRowLog.comment} + </p> + <hr /> + </div> + + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,270 +1,299 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Plan d'Echantillonnage" t:contentId="so-sampling" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <div class="${mainClass}"> - <t:if t:test="canImportSamplingPlan()"> - <div class="so-import"> - <form t:type="form" t:id="importSamplingPlan" action="post"> - <fieldset> - <legend>Import d'un nouveau plan d'échantillonnage</legend> - <t:errors /> - <t:label for="samplingPlanCsvFile" /> : - <input t:type="upload" t:id="samplingPlanCsvFile" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" title="Importer un plan d'échantillonnage (format CSV avec encodage UTF-8)" /> - </fieldset> - </form> - </div> - </t:if> - <div class="clearfix mbottom10"> - <div class="clearfix"> - <h1 class="fleft">Plan d'échantillonnage</h1> - <div class="fleft actions-top"> - <span> - <a t:type="actionlink" t:id="exportSamplingPlan"> - <img src="${asset:context:}/img/file-export-22px.png" alt="Export CSV" - title="Exporter le plan d'échantillonnage du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" /> - </a> - </span> - <span> - <a t:type="actionlink" t:id="changeFilterEstimatedTides"> - <t:if t:test="filter.estimatedTides"> - <img src="${asset:context:img/true-22px.png}" alt="Effort d'observations réalisé pour contacts validés" - title="Afficher l'effort d'observations réalisé pour les contacts validés seulement" /> - <p:else> - <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations réalisé pour contacts terminés" - title="Afficher l'effort d'observations réalisé pour les contacts validés + celui estimé pour les contacts non validés" /> - </p:else> - </t:if> - </a> - </span> - <t:if t:test="user.admin"> - <span> - <a t:type="actionlink" t:id="toggleDisplayMode"> - <t:if t:test="fullView"> - <img src="${asset:context:}/img/samplingPlan-reduce.png" alt="Réduire" - title="Réduire le plan d'échantillonnage"/> - <p:else> - <img src="${asset:context:}/img/samplingPlan-full.png" alt="Agrandir" - title="Agrandir le plan d'échantillonnage"/> - </p:else> - </t:if> - </a> - </span> - <t:if t:test="canEditSampleRow()"> - <span> - <a t:type="pagelink" t:page="sampleRowForm"> - <img src="${asset:context:}/img/add.png" alt="Ajouter" title="Ajouter une nouvelle ligne"/> - </a> - </span> - </t:if> - </t:if> - </div> - </div> - <form t:type="form" t:id="periodForm" action="post"> - <div> - <t:label t:for="periodBegin" /> : - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <t:label t:for="periodEnd" /> : - <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required" />  - <input t:type="submit" class="ico search" value="Search" t:title="Affichage des lignes du plan couvertes par la période sélectionnée" /> - <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form">recherche avancée</a> - </div> - </form> - <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> - <fieldset> - <legend>Recherche avancée</legend> - <div class="so-filters-form"> - <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> - <t:errors /> - <div class="t-beaneditor"> - <div> - <t:if t:test="user.admin"> - <t:label t:for="company" />: - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" - title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  - </t:if> - <t:label t:for="programName" />: - <select t:type="select" t:id="programName" t:model="programSelectModel" t:value="filter.programName" />  - <t:label t:for="codeDCF5" />: - <input t:type="textfield" t:id="codeDCF5" value="filter.codeDCF5" t:mixins="Autocomplete"/> - </div> - <div> - <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" - title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  - <t:label t:for="sectorName" />: - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" t:value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" />  - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> - </div> - </div> - </form> - </div> - </fieldset> - </div> - </div> - <t:zone t:id="samplingZone"> - <table class="t-data-grid"> - <thead> - <tr class="main"> - <td colspan="${nbColumnsForProfession}">Métiers échantillonnés</td> - <td colspan="${nbColumnsForMonths}"> - Effort d'observation en nombre de marées - [ planifié <em>(réalisé <t:if t:test="filter.estimatedTides">+ estimé</t:if>)</em> ] - </td> - <td colspan="${nbColumnsForOther}">Autres</td> - </tr> - <tr> - <td class="bleft">Code ligne</td> - <td class="width150">Programme ou règlement rattachement</td> - <t:if t:test="fullView"> - <td>Société</td> - </t:if> - <td>Zone</td> - <t:if t:test="fullView"> - <td>Zone de pêche info</td> - <td>METIER<br />Code DCF5</td> - <td>METIER<br />Maillage</td> - <td>METIER<br />Taille</td> - <td>METIER<br />Autre info</td> - <td>METIER<br />Libellé</td> - <td>METIER<br />Espèces cibles</td> - <td>Date de début</td> - <td class="bright">Date de fin</td> - <p:else> - <td>METIER<br />Code</td> - <td class="bright">METIER<br />Libellé</td> - </p:else> - </t:if> - <t:loop source="months" value="month"> - <td class="width50"><t:output value="month" format="dateFormat" /></td> - </t:loop> - <td class="width50 bright">total</td> - <td class="width60">Durée moyenne d'une marée (J.)</td> - <td class="width60">Nb. d'observateurs</td> - <td class="width60 bright">Commentaire</td> - <td class="bright">Actions</td> - </tr> - </thead> - <tfoot> - <tr><td></td></tr> - </tfoot> - <tbody> - <t:loop source="data" value="row" index="rowIndex"> - <t:if t:test="facadeChanged"> - <tr> - <td colspan="${nbColumnsTotal}" class="facade"> - ${currentFacadeName} - </td> - </tr> - </t:if> - <t:if t:test="sectorChanged"> - <tr> - <td colspan="${nbColumnsTotal}" class="sector bright bleft"> - ${currentSectorName} - </td> - </tr> - </t:if> - <tr class="${parityClass}"> - <td class="bleft"> - <a t:type="actionlink" t:id="filterPeriodDates" t:context="rowIndex" - title="Changer les dates de la période par rapport à celles de la ligne"> - ${row.code} - </a> - </td> - <td class="width150">${row.programName}</td> - <t:if t:test="fullView"> - <td>${companyName}</td> - </t:if> - <t:if t:test="fullView"> - <td>${fishingZones}</td> - <td>${row.fishingZonesInfos}</td> - <td>${row.profession.codeDCF5}</td> - <td>${row.profession.meshSize}</td> - <td>${row.profession.size}</td> - <td>${row.profession.other}</td> - <td>${row.profession.libelle}</td> - <td>${row.profession.species}</td> - <td><t:output value="row.periodBegin" format="dateFormat" /></td> - <td class="bright"><t:output value="row.periodEnd" format="dateFormat" /></td> - <p:else> - <td> - <span t:type="ck/Tooltip" title="Infos" t:value="prop:row.fishingZonesInfos" t:effect="appear"> - ${fishingZones} - </span> - </td> - <td>${row.profession.code}</td> - <td class="bright"> - <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear"> - ${row.profession.libelle} - </span> - </td> - </p:else> - </t:if> - <t:loop source="months" value="month"> - <td class="width50 acenter ${monthCurrentClass}"> - ${nbTidesExpected} - <t:if t:test="hasNbTidesReal()"> - <span class="${realTidesClass}"><em>(${nbTidesReal})</em></span> - </t:if> - </td> - </t:loop> - <td class="width50 acenter bright"> - <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" t:effect="appear"> - ${row.totalTidesExpected} <em>(${row.totalTidesReal})</em><br /><strong>${totalPercentage}</strong> - </span> - </td> - <td class="width60 acenter"><t:output t:value="row.averageTideTime" t:format="numberFormat" /></td> - <td class="width60 acenter">${row.nbObservants}</td> - <td class="width60 acenter bright"> - <t:if t:test="row.comment"> - <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:rowComment" t:effect="appear"> - <img src="${asset:context:}/img/comment-22px.png" alt="comment" /> - </span> - </t:if> - </td> -  - <td class="${actionsClass} bright"> - <t:if t:test="canAccessBoats()"> - <a t:type="pagelink" t:page="boats" t:context="row.topiaId"> - <img src="${asset:context:}/img/boat.png" alt="Navire" title="Voir les navires éligibles pour cette ligne"/> - </a> - <p:else> - <img src="${asset:context:}/img/boat-unavailable-22px.png" alt="Navire impossible" title="Accès aux navires impossible, ligne terminée"/> - </p:else> - </t:if> - <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> - <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> - </a> - <t:if t:test="canEditSampleRow()"> - <a t:type="pagelink" t:page="sampleRowForm" t:context="row.topiaId"> - <img src="${asset:context:}/img/edit.png" alt="Modifier" title="Modifier la ligne"/> - </a> - <t:unless t:test="row.hasSampleMonthRealTideTime()"> - <a t:type="actionlink" t:id="deleteSampleRow" t:context="rowIndex" title="Supprimer la ligne d'échantillon" - t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement la ligne ${row.code} du plan d\'échantillonnage ?"> - <img src="${asset:context:}/img/delete2.png" alt="Supprimer" title="Supprimer la ligne"/> - </a> - <p:else> - <img src="${asset:context:}/img/delete-unavailable-22px.png" alt="Supprimer indisponible" title="Suppression de la ligne indisponible"/> - </p:else> - </t:unless> - </t:if> - </td> - </tr> - </t:loop> - </tbody> - </table> - </t:zone> - </div> - - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Plan d'Echantillonnage" t:contentId="so-sampling" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <div class="${mainClass}"> + <t:if t:test="canImportSamplingPlan()"> + <div class="so-import"> + <form t:type="form" t:id="importSamplingPlan" action="post"> + <fieldset> + <legend>Import d'un nouveau plan d'échantillonnage</legend> + <t:errors /> + <t:label for="samplingPlanCsvFile" /> : + <input t:type="upload" t:id="samplingPlanCsvFile" t:validate="required" /> + <input t:type="submit" class="ico import" value="OK" title="Importer un plan d'échantillonnage (format CSV avec encodage UTF-8)" /> + </fieldset> + </form> + </div> + </t:if> + <div class="clearfix mbottom10"> + <div class="clearfix"> + <h1 class="fleft">Plan d'échantillonnage</h1> + <div class="fleft actions-top"> + <span> + <a t:type="actionlink" t:id="exportSamplingPlan"> + <img src="${asset:context:}/img/file-export-22px.png" alt="Export CSV" + title="Exporter le plan d'échantillonnage du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" /> + </a> + </span> + <span> + <a t:type="actionlink" t:id="changeFilterEstimatedTides"> + <t:if t:test="filter.estimatedTides"> + <img src="${asset:context:img/true-22px.png}" alt="Effort d'observations réalisé pour contacts validés" + title="Afficher l'effort d'observations réalisé pour les contacts validés seulement" /> + <p:else> + <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations réalisé pour contacts terminés" + title="Afficher l'effort d'observations réalisé pour les contacts validés + celui estimé pour les contacts non validés" /> + </p:else> + </t:if> + </a> + </span> + <t:if t:test="user.admin"> + <span> + <a t:type="actionlink" t:id="toggleDisplayMode"> + <t:if t:test="fullView"> + <img src="${asset:context:}/img/samplingPlan-reduce.png" alt="Réduire" + title="Réduire le plan d'échantillonnage"/> + <p:else> + <img src="${asset:context:}/img/samplingPlan-full.png" alt="Agrandir" + title="Agrandir le plan d'échantillonnage"/> + </p:else> + </t:if> + </a> + </span> + <t:if t:test="canEditSampleRow()"> + <span> + <a t:type="pagelink" t:page="sampleRowForm"> + <img src="${asset:context:}/img/add.png" alt="Ajouter" title="Ajouter une nouvelle ligne"/> + </a> + </span> + </t:if> + </t:if> + </div> + </div> + <form t:type="form" t:id="periodForm" action="post"> + <div> + <t:label t:for="periodBegin" /> : + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  + <t:label t:for="periodEnd" /> : + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required" />  + <input t:type="submit" class="ico search" value="Search" t:title="Affichage des lignes du plan couvertes par la période sélectionnée" /> + <a t:type="actionlink" t:id="showFilters" t:zone="so-sampling-filters" class="display-form">recherche avancée</a> + </div> + </form> + <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> + <fieldset> + <legend>Recherche avancée</legend> + <div class="so-filters-form"> + <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> + <t:errors /> + <div class="t-beaneditor"> + <div> + <t:if t:test="user.admin"> + <t:label t:for="company" />: + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  + <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" + title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  + </t:if> + <t:label t:for="programName" />: + <select t:type="select" t:id="programName" t:model="programSelectModel" t:value="filter.programName" />  + <t:label t:for="codeDCF5" />: + <input t:type="textfield" t:id="codeDCF5" value="filter.codeDCF5" t:mixins="Autocomplete"/> + </div> + <div> + <t:label t:for="facadeName" />: + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" t:value="filter.facadeName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" + title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  + <t:label t:for="sectorName" />: + <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" t:value="filter.sectorName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" + title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  + <t:label t:for="sampleRow" />: + <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Rechercher les lignes du plan correspondants aux filtres saisies" />  + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> + </div> + </div> + </form> + </div> + </fieldset> + </div> + </div> + <t:zone t:id="samplingZone"> + <table class="t-data-grid"> + <thead> + <tr class="main"> + <td colspan="${nbColumnsForProfession}">Métiers échantillonnés</td> + <td colspan="${nbColumnsForMonths}"> + Effort d'observation en nombre de marées + [ planifié <em>(réalisé <t:if t:test="filter.estimatedTides">+ estimé</t:if>)</em> ] + </td> + <td colspan="${nbColumnsForOther}">Autres</td> + </tr> + <tr> + <td class="bleft">Code ligne</td> + <td class="width150">Programme ou règlement rattachement</td> + <t:if t:test="fullView"> + <td>Société</td> + </t:if> + <td>Zone</td> + <t:if t:test="fullView"> + <td>Zone de pêche info</td> + <td>METIER<br />Code DCF5</td> + <td>METIER<br />Maillage</td> + <td>METIER<br />Taille</td> + <td>METIER<br />Autre info</td> + <td>METIER<br />Libellé</td> + <td>METIER<br />Espèces cibles</td> + <td>Date de début</td> + <td class="bright">Date de fin</td> + <p:else> + <td>METIER<br />Code</td> + <td class="bright">METIER<br />Libellé</td> + </p:else> + </t:if> + <t:loop source="months" value="month"> + <td class="width50"><t:output value="month" format="dateFormat" /></td> + </t:loop> + <td class="width50 bright">total</td> + <td class="width60">Durée moyenne d'une marée (J.)</td> + <td class="width60">Nb. d'observateurs</td> + <td class="width60 bright">Commentaire</td> + <td class="bright">Actions</td> + </tr> + </thead> + <tfoot> + <tr><td></td></tr> + </tfoot> + <tbody> + <t:loop source="data" value="row" index="rowIndex"> + <t:if t:test="facadeChanged"> + <tr> + <td colspan="${nbColumnsTotal}" class="facade"> + ${currentFacadeName} + </td> + </tr> + </t:if> + <t:if t:test="sectorChanged"> + <tr> + <td colspan="${nbColumnsTotal}" class="sector bright bleft"> + ${currentSectorName} + </td> + </tr> + </t:if> + <tr class="${parityClass}"> + <td class="bleft"> + <a t:type="actionlink" t:id="filterPeriodDates" t:context="rowIndex" + title="Changer les dates de la période par rapport à celles de la ligne"> + ${row.code} + </a> + </td> + <td class="width150">${row.programName}</td> + <t:if t:test="fullView"> + <td>${companyName}</td> + </t:if> + <t:if t:test="fullView"> + <td>${fishingZones}</td> + <td>${row.fishingZonesInfos}</td> + <td>${row.profession.codeDCF5}</td> + <td>${row.profession.meshSize}</td> + <td>${row.profession.size}</td> + <td>${row.profession.other}</td> + <td>${row.profession.libelle}</td> + <td>${row.profession.species}</td> + <td><t:output value="row.periodBegin" format="dateFormat" /></td> + <td class="bright"><t:output value="row.periodEnd" format="dateFormat" /></td> + <p:else> + <td> + <span t:type="ck/Tooltip" title="Infos" t:value="prop:row.fishingZonesInfos" t:effect="appear"> + ${fishingZones} + </span> + </td> + <td>${row.profession.code}</td> + <td class="bright"> + <span t:type="ck/Tooltip" title="Infos" t:value="Espèces cibles : ${row.profession.species}" t:effect="appear"> + ${row.profession.libelle} + </span> + </td> + </p:else> + </t:if> + <t:loop source="months" value="month"> + <td class="width50 acenter ${monthCurrentClass}"> + ${nbTidesExpected} + <t:if t:test="hasNbTidesReal()"> + <span class="${realTidesClass}"><em>(${nbTidesReal})</em></span> + </t:if> + </td> + </t:loop> + <td class="width50 acenter bright"> + <span t:type="ck/Tooltip" title="Infos" t:value="Total sur la période du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" t:effect="appear"> + ${row.totalTidesExpected} <em>(${row.totalTidesReal})</em><br /><strong>${totalPercentage}</strong> + </span> + </td> + <td class="width60 acenter"><t:output t:value="row.averageTideTime" t:format="numberFormat" /></td> + <td class="width60 acenter">${row.nbObservants}</td> + <td class="width60 acenter bright"> + <t:if t:test="row.comment"> + <span t:type="ck/Tooltip" title="Commentaire" t:value="prop:rowComment" t:effect="appear"> + <img src="${asset:context:}/img/comment-22px.png" alt="comment" /> + </span> + </t:if> + </td> +  + <td class="${actionsClass} bright"> + <t:if t:test="canAccessBoats()"> + <a t:type="pagelink" t:page="boats" t:context="row.topiaId"> + <img src="${asset:context:}/img/boat.png" alt="Navire" title="Voir les navires éligibles pour cette ligne"/> + </a> + <p:else> + <img src="${asset:context:}/img/boat-unavailable-22px.png" alt="Navire impossible" title="Accès aux navires impossible, ligne terminée"/> + </p:else> + </t:if> + <a t:type="pagelink" t:page="sampleRowHistoric" t:context="row.code"> + <img src="${asset:context:}/img/clock-22px.png" alt="Historique" title="Voir historique de la ligne"/> + </a> + <t:if t:test="canEditSampleRow()"> + <a t:type="pagelink" t:page="sampleRowForm" t:context="row.topiaId"> + <img src="${asset:context:}/img/edit.png" alt="Modifier" title="Modifier la ligne"/> + </a> + <t:unless t:test="row.hasSampleMonthRealTideTime()"> + <a t:type="actionlink" t:id="deleteSampleRow" t:context="rowIndex" title="Supprimer la ligne d'échantillon" + t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement la ligne ${row.code} du plan d\'échantillonnage ?"> + <img src="${asset:context:}/img/delete2.png" alt="Supprimer" title="Supprimer la ligne"/> + </a> + <p:else> + <img src="${asset:context:}/img/delete-unavailable-22px.png" alt="Supprimer indisponible" title="Suppression de la ligne indisponible"/> + </p:else> + </t:unless> + </t:if> + </td> + </tr> + </t:loop> + </tbody> + </table> + </t:zone> + </div> + + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/SamplingPlan.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,282 +1,311 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Synthèse et indicateurs" t:contentId="so-synthesis" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - -  - <div class="clearfix"> - <div class="fleft" id="so-synthesis-menu"> - <ul> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="Diagramme en bâtons" - title="Graphique des données des marées (réalisé / planifié)" /> - </a> - </li> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="Diagramme en bâtons" - title="Graphique des sollicitations des navires" /> - </a> - </li> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_NON_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" - title="Indicateur de non respect du nombre d'observateurs embarqués" /> - </a> - </li> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur" - title="Indicateur sur les états des contacts" /> - </a> - </li> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur" - title="Indicateur de réactivité sur la saisie des données dans Allegro" /> - </a> - </li> - </ul> - </div> - <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> - <t:delegate t:to="activeBlock" /> - </div> - </div> - -  - <t:block t:id="graph1"> - <div class="acenter" id="so-datasampling"> - <h2>Données des marées (réalisé / planifié)</h2> - <fieldset> - <legend>Filtres</legend> - <div t:type="zone" t:id="filtersZone" class="so-filters-form" id="so-datasampling-filters"> -  - <form t:type="form" t:id="filtersForm" t:zone="so-datasampling-filters"> - <t:errors /> - <div class="t-beaneditor"> - <div class="filterRow"> - <label>Période: </label> - <t:label t:for="periodBegin" />: - <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <t:label t:for="periodEnd" />: - <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required"/> - </div> - <div> - <t:if t:test="user.admin"> - <t:label t:for="company" />: - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  - <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" - title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  - </t:if> - <t:label t:for="programName" />: - <select t:type="select" t:id="programName" t:model="programSelectModel" value="filter.programName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByProgram" value="Refresh" - title="Rafraîchir les secteurs de pêche et les métiers en fonction du programme sélectionné"/> - </div> - <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> - <t:label t:for="facadeName" />: - <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" - title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  - <t:label t:for="sectorName" />: - <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  - <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" - title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  - <t:label t:for="sampleRow" />: - <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> -  - </div> - <div class="t-beaneditor-row aright"> - <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/>  - <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> - </div> - </div> - </form> -  - </div> - </fieldset> - <p class="so-chart-types"> - <a t:type="actionlink" t:context="[actionChartType,'BAR']"> - <img src="${asset:context:}/img/chart-bar.png" alt="Diagramme en bâtons" title="Diagramme en bâtons" /> - </a>  - <a t:type="actionlink" t:context="[actionChartType,'AREA']"> - <img src="${asset:context:}/img/chart-area.png" alt="Diagramme avec zones" title="Diagramme avec zones" /> - </a>  - <a t:type="actionlink" t:context="[actionChartType,'LINE']"> - <img src="${asset:context:}/img/chart-line.png" alt="Diagramme linéaire (courbe)" title="Diagramme linéaire (courbe)" /> - </a> - </p> -  - <t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" /> -  - </div> - </t:block> -  - <t:block t:id="graph2"> - <div class="acenter"> - <h2>Sollicitations des navires</h2> - <br /> - <p>Ces résultats ne concernent que les lignes du plan d'échantillonnage<br /> ayant une durée moyenne de marées inférieure ou égale à 48h</p> - <br /> - <t:if t:test="user.admin"> - <form t:type="form" t:id="filterCompanyForBoarding"> - <t:label t:for="companyForBoarding" />: - <input t:type="select" t:id="companyForBoarding" t:model="companySelectModel" value="companyIdForBoarding"/>  - <input t:type="submit" class="ico search-32px" t:id="searchForBoarding" value="Search" - title="Création du graphique pour cette société"/> - </form> - </t:if> - <t:chart t:width="600" t:height="400" t:chart="boardingBoatsChart" /> - <t:if t:test="boardingResult.maxBoardingBoat"> - <p> - Navire le plus sollicité avec ${boardingResult.maxBoardingValue} embarquements : - <strong>${boardingResult.maxBoardingBoat.name} (${boardingResult.maxBoardingBoat.immatriculation})</strong> - </p> - </t:if> - </div> - </t:block> -  - <t:block t:id="ind1"> - <div class="ind-table acenter" id="so-noncomplianceboarding"> - <h2>Non respect du nombre d'observateurs embarqués</h2> - <br /> - <t:if t:test="user.admin"> - <p> - Ces résultats concernent l'ensemble des contrats en cours - ayant des données réelles (contacts validés). - </p> - <table class="t-data-grid"> - <thead> - <tr> - <th class="company">Société</th> - <th>Indicateur</th> - </tr> - </thead> - <tbody> - <tr t:type="loop" t:source="nonComplianceBoarding.entrySet()" t:value="nonComplianceBoardingEntry"> - <td class="company">${nonComplianceBoardingEntry.key}</td> - <td class="number"> - <t:output t:value="nonComplianceBoardingEntry.value" t:format="percentFormat"/> - </td> - </tr> - </tbody> - </table> - <p:else> - <p> - Ce résultat concerne l'ensemble des contrats en cours - pour votre société ayant des données réelles (contacts validés). - </p> - <div class="indicator"> - <p class="number"> - <span t:type="output" t:value="nonComplianceBoardingValue" t:format="percentFormat"> - ${nonComplianceBoardingValue} - </span> - </p> - </div> - </p:else> - </t:if> - </div> - </t:block> -  - <t:block t:id="ind2"> - <div class="ind-table acenter" id="so-contactstate"> - <h2>Etats des contacts</h2> - <br /> - <p> - Ces résultats concernent l'ensemble des états des contacts<br /> excepté - ceux qui ont été refusés par le programme. - </p> - <br /> - <p> - <form t:type="form" t:id="filterPeriodForContactStates"> - <label>Période : </label> - <t:label t:for="periodBeginForContactStates" />  - <input t:type="datefield" class="width70" t:id="periodBeginForContactStates" t:value="periodForContactStates.fromDate" t:format="MM/yyyy" t:validate="required"/>  - <t:label t:for="periodEndForContactStates" />  - <input t:type="datefield" class="width70" t:id="periodEndForContactStates" t:value="periodForContactStates.thruDate" t:format="MM/yyyy" t:validate="required" />  - <input t:type="submit" class="ico search-32px" t:id="searchForContactStates" value="Search" - title="Rechercher les états des contacts sur cette période"/> - </form> - </p> - <table class="t-data-grid"> - <thead> - <tr> - <t:if t:test="user.admin"> - <th class="company">Société</th> - </t:if> - <th t:type="loop" t:source="contactStates" t:value="contactState"> - ${contactState.libelle()} - </th> - <th>Total</th> - </tr> - </thead> - <tbody> - <tr t:type="loop" t:source="contactStateStatistics" t:value="contactStateStats"> - <t:if t:test="user.admin"> - <td class="company">${contactStateStats.companyName}</td> - </t:if> - <td t:type="loop" t:source="contactStates" t:value="contactState" - class="number-contactstate"> - <t:if t:test="nbContactStates"> - ${nbContactStates} - (<span t:type="output" t:value="percentContactStates" t:format="percentFormat">${percentContactStates}</span>) - <p:else> - - - </p:else> - </t:if> - </td> - <td>${contactStateStats.total}</td> - </tr> - </tbody> - </table> - </div> - </t:block> -  - <t:block t:id="ind3"> - <div class="ind-table acenter" id="so-allegroreactivity"> - <h2>Réactivité de la saisie dans Allegro par rapport à la date de fin de la marée</h2> - <br /> - <p> - Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée des contacts validés. - </p> - <br /> - <p> - <form t:type="form" t:id="filterPeriodForAllegroReactivity"> - <label>Période : </label> - <t:label t:for="periodBeginForAllegroReactivity" />  - <input t:type="datefield" class="width70" t:id="periodBeginForAllegroReactivity" t:value="periodForAllegroReactivity.fromDate" />  - <t:label t:for="periodEndForAllegroReactivity" />  - <input t:type="datefield" class="width70" t:id="periodEndForAllegroReactivity" t:value="periodForAllegroReactivity.thruDate" />  - <input t:type="submit" class="ico search-32px" t:id="searchForAllegroReactivity" value="Search" - title="Calcul de la moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de marée sur la période sélectionnée"/> - </form> - </p> - <t:if t:test="user.admin"> - <table class="t-data-grid"> - <thead> - <tr> - <th class="company">Société</th> - <th>Indicateur</th> - </tr> - </thead> - <tbody> - <tr t:type="loop" t:source="allegroReactivity" t:value="allegroReactivityEntry"> - <td class="company">${allegroReactivityEntry.companyName}</td> - <td class="number${allegroReactivityStyle}"> - <t:output t:value="allegroReactivityEntry.result" t:format="numberFormat" /> - </td> - </tr> - </tbody> - </table> - <p:else> - <div class="indicator"> - <p class="number${allegroReactivityStyle}"> - <t:output t:value="allegroReactivityValue" t:format="numberFormat" /> - </p> - </div> - </p:else> - </t:if> - </div> - </t:block> -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Synthèse et indicateurs" t:contentId="so-synthesis" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + +  + <div class="clearfix"> + <div class="fleft" id="so-synthesis-menu"> + <ul> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_SAMPLING']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-graph-sampling.png" alt="Diagramme en bâtons" + title="Graphique des données des marées (réalisé / planifié)" /> + </a> + </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'GRAPH_BOARDING']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-graph-boarding.png" alt="Diagramme en bâtons" + title="Graphique des sollicitations des navires" /> + </a> + </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_NON_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur" + title="Indicateur de non respect du nombre d'observateurs embarqués" /> + </a> + </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur" + title="Indicateur sur les états des contacts" /> + </a> + </li> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur" + title="Indicateur de réactivité sur la saisie des données dans Allegro" /> + </a> + </li> + </ul> + </div> + <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main"> + <t:delegate t:to="activeBlock" /> + </div> + </div> + +  + <t:block t:id="graph1"> + <div class="acenter" id="so-datasampling"> + <h2>Données des marées (réalisé / planifié)</h2> + <fieldset> + <legend>Filtres</legend> + <div t:type="zone" t:id="filtersZone" class="so-filters-form" id="so-datasampling-filters"> +  + <form t:type="form" t:id="filtersForm" t:zone="so-datasampling-filters"> + <t:errors /> + <div class="t-beaneditor"> + <div class="filterRow"> + <label>Période: </label> + <t:label t:for="periodBegin" />: + <input t:type="datefield" class="width70" t:id="periodBegin" t:value="period.fromDate" t:format="MM/yyyy" t:validate="required"/>  + <t:label t:for="periodEnd" />: + <input t:type="datefield" class="width70" t:id="periodEnd" t:value="period.thruDate" t:format="MM/yyyy" t:validate="required"/> + </div> + <div> + <t:if t:test="user.admin"> + <t:label t:for="company" />: + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId"/>  + <input t:type="submit" class="ico22px refresh" t:id="refreshByCompany" value="Refresh" + title="Rafraîchir les filtres en fonction de la société sélectionnée"/>  + </t:if> + <t:label t:for="programName" />: + <select t:type="select" t:id="programName" t:model="programSelectModel" value="filter.programName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshByProgram" value="Refresh" + title="Rafraîchir les secteurs de pêche et les métiers en fonction du programme sélectionné"/> + </div> + <div class="filterRow" t:type="zone" t:id="sampleRowZone" t:update="show"> + <t:label t:for="facadeName" />: + <select t:type="select" t:id="facadeName" t:model="facadeSelectModel" value="filter.facadeName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshByFacade" value="Refresh" + title="Rafraîchir les zones et les métiers en fonction de la façade sélectionnée"/>  + <t:label t:for="sectorName" />: + <select t:type="select" t:id="sectorName" t:model="sectorSelectModel" value="filter.sectorName" />  + <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" + title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  + <t:label t:for="sampleRow" />: + <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> +  + </div> + <div class="t-beaneditor-row aright"> + <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/>  + <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" /> + </div> + </div> + </form> +  + </div> + </fieldset> + <p class="so-chart-types"> + <a t:type="actionlink" t:context="[actionChartType,'BAR']"> + <img src="${asset:context:}/img/chart-bar.png" alt="Diagramme en bâtons" title="Diagramme en bâtons" /> + </a>  + <a t:type="actionlink" t:context="[actionChartType,'AREA']"> + <img src="${asset:context:}/img/chart-area.png" alt="Diagramme avec zones" title="Diagramme avec zones" /> + </a>  + <a t:type="actionlink" t:context="[actionChartType,'LINE']"> + <img src="${asset:context:}/img/chart-line.png" alt="Diagramme linéaire (courbe)" title="Diagramme linéaire (courbe)" /> + </a> + </p> +  + <t:chart t:width="600" t:height="400" t:chart="dataSamplingChart" /> +  + </div> + </t:block> +  + <t:block t:id="graph2"> + <div class="acenter"> + <h2>Sollicitations des navires</h2> + <br /> + <p>Ces résultats ne concernent que les lignes du plan d'échantillonnage<br /> ayant une durée moyenne de marées inférieure ou égale à 48h</p> + <br /> + <t:if t:test="user.admin"> + <form t:type="form" t:id="filterCompanyForBoarding"> + <t:label t:for="companyForBoarding" />: + <input t:type="select" t:id="companyForBoarding" t:model="companySelectModel" value="companyIdForBoarding"/>  + <input t:type="submit" class="ico search-32px" t:id="searchForBoarding" value="Search" + title="Création du graphique pour cette société"/> + </form> + </t:if> + <t:chart t:width="600" t:height="400" t:chart="boardingBoatsChart" /> + <t:if t:test="boardingResult.maxBoardingBoat"> + <p> + Navire le plus sollicité avec ${boardingResult.maxBoardingValue} embarquements : + <strong>${boardingResult.maxBoardingBoat.name} (${boardingResult.maxBoardingBoat.immatriculation})</strong> + </p> + </t:if> + </div> + </t:block> +  + <t:block t:id="ind1"> + <div class="ind-table acenter" id="so-noncomplianceboarding"> + <h2>Non respect du nombre d'observateurs embarqués</h2> + <br /> + <t:if t:test="user.admin"> + <p> + Ces résultats concernent l'ensemble des contrats en cours + ayant des données réelles (contacts validés). + </p> + <table class="t-data-grid"> + <thead> + <tr> + <th class="company">Société</th> + <th>Indicateur</th> + </tr> + </thead> + <tbody> + <tr t:type="loop" t:source="nonComplianceBoarding.entrySet()" t:value="nonComplianceBoardingEntry"> + <td class="company">${nonComplianceBoardingEntry.key}</td> + <td class="number"> + <t:output t:value="nonComplianceBoardingEntry.value" t:format="percentFormat"/> + </td> + </tr> + </tbody> + </table> + <p:else> + <p> + Ce résultat concerne l'ensemble des contrats en cours + pour votre société ayant des données réelles (contacts validés). + </p> + <div class="indicator"> + <p class="number"> + <span t:type="output" t:value="nonComplianceBoardingValue" t:format="percentFormat"> + ${nonComplianceBoardingValue} + </span> + </p> + </div> + </p:else> + </t:if> + </div> + </t:block> +  + <t:block t:id="ind2"> + <div class="ind-table acenter" id="so-contactstate"> + <h2>Etats des contacts</h2> + <br /> + <p> + Ces résultats concernent l'ensemble des états des contacts<br /> excepté + ceux qui ont été refusés par le programme. + </p> + <br /> + <p> + <form t:type="form" t:id="filterPeriodForContactStates"> + <label>Période : </label> + <t:label t:for="periodBeginForContactStates" />  + <input t:type="datefield" class="width70" t:id="periodBeginForContactStates" t:value="periodForContactStates.fromDate" t:format="MM/yyyy" t:validate="required"/>  + <t:label t:for="periodEndForContactStates" />  + <input t:type="datefield" class="width70" t:id="periodEndForContactStates" t:value="periodForContactStates.thruDate" t:format="MM/yyyy" t:validate="required" />  + <input t:type="submit" class="ico search-32px" t:id="searchForContactStates" value="Search" + title="Rechercher les états des contacts sur cette période"/> + </form> + </p> + <table class="t-data-grid"> + <thead> + <tr> + <t:if t:test="user.admin"> + <th class="company">Société</th> + </t:if> + <th t:type="loop" t:source="contactStates" t:value="contactState"> + ${contactState.libelle()} + </th> + <th>Total</th> + </tr> + </thead> + <tbody> + <tr t:type="loop" t:source="contactStateStatistics" t:value="contactStateStats"> + <t:if t:test="user.admin"> + <td class="company">${contactStateStats.companyName}</td> + </t:if> + <td t:type="loop" t:source="contactStates" t:value="contactState" + class="number-contactstate"> + <t:if t:test="nbContactStates"> + ${nbContactStates} + (<span t:type="output" t:value="percentContactStates" t:format="percentFormat">${percentContactStates}</span>) + <p:else> + - + </p:else> + </t:if> + </td> + <td>${contactStateStats.total}</td> + </tr> + </tbody> + </table> + </div> + </t:block> +  + <t:block t:id="ind3"> + <div class="ind-table acenter" id="so-allegroreactivity"> + <h2>Réactivité de la saisie dans Allegro par rapport à la date de fin de la marée</h2> + <br /> + <p> + Ce résultat est une moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de la marée des contacts validés. + </p> + <br /> + <p> + <form t:type="form" t:id="filterPeriodForAllegroReactivity"> + <label>Période : </label> + <t:label t:for="periodBeginForAllegroReactivity" />  + <input t:type="datefield" class="width70" t:id="periodBeginForAllegroReactivity" t:value="periodForAllegroReactivity.fromDate" />  + <t:label t:for="periodEndForAllegroReactivity" />  + <input t:type="datefield" class="width70" t:id="periodEndForAllegroReactivity" t:value="periodForAllegroReactivity.thruDate" />  + <input t:type="submit" class="ico search-32px" t:id="searchForAllegroReactivity" value="Search" + title="Calcul de la moyenne du nombre de jours entre la date de saisie dans Allegro et la date de fin de marée sur la période sélectionnée"/> + </form> + </p> + <t:if t:test="user.admin"> + <table class="t-data-grid"> + <thead> + <tr> + <th class="company">Société</th> + <th>Indicateur</th> + </tr> + </thead> + <tbody> + <tr t:type="loop" t:source="allegroReactivity" t:value="allegroReactivityEntry"> + <td class="company">${allegroReactivityEntry.companyName}</td> + <td class="number${allegroReactivityStyle}"> + <t:output t:value="allegroReactivityEntry.result" t:format="numberFormat" /> + </td> + </tr> + </tbody> + </table> + <p:else> + <div class="indicator"> + <p class="number${allegroReactivityStyle}"> + <t:output t:value="allegroReactivityValue" t:format="numberFormat" /> + </p> + </div> + </p:else> + </t:if> + </div> + </t:block> +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/Synthesis.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/UserProfile.tml =================================================================== --- trunk/wao-ui/src/main/webapp/UserProfile.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/UserProfile.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,23 +1,52 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<t:layout t:pageTitle="Gestion du profile utilisateur" t:contentId="so-user-profile" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <fieldset class="user-form"> - <form t:type="beaneditform" class="clearfix" t:id="userForm" t:object="userEditable" - t:include="firstName, lastName, login, phoneNumber, password" t:add="password2"> - <p:password> - <t:label t:for="password" /> - <input t:type="passwordfield" t:id="password" value="password"/> - </p:password> - <p:password2> - <t:label t:for="password2" /> - <input t:type="passwordfield" t:id="password2" value="password2"/> - </p:password2> - - </form> - </fieldset> - -</t:layout> +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<t:layout t:pageTitle="Gestion du profile utilisateur" t:contentId="so-user-profile" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <fieldset class="user-form"> + <form t:type="beaneditform" class="clearfix" t:id="userForm" t:object="userEditable" + t:include="firstName, lastName, login, phoneNumber, password" t:add="password2"> + <p:password> + <t:label t:for="password" /> + <input t:type="passwordfield" t:id="password" value="password"/> + </p:password> + <p:password2> + <t:label t:for="password2" /> + <input t:type="passwordfield" t:id="password2" value="password2"/> + </p:password2> + + </form> + </fieldset> + +</t:layout> Property changes on: trunk/wao-ui/src/main/webapp/UserProfile.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +### +# #%L +# Wao :: Web Interface +# +# $Author$ +# $LastChangedDate$ +# $LastChangedRevision$ +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # This is where global application properties go. #ContactState enum Property changes on: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wao-ui/src/main/webapp/WEB-INF/app_en.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app_en.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app_en.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1 +0,0 @@ - Deleted: trunk/wao-ui/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app_fr.properties 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app_fr.properties 2010-04-15 09:17:48 UTC (rev 448) @@ -1 +0,0 @@ - Modified: trunk/wao-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,20 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> @@ -30,15 +42,7 @@ <filter-name>app</filter-name> <filter-class>org.apache.tapestry5.TapestryFilter</filter-class> </filter> -  - <filter-mapping> <filter-name>app</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> Property changes on: trunk/wao-ui/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/administration.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/administration.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/administration.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : administration Created on : 12 nov. 2009, 16:09:18 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ Property changes on: trunk/wao-ui/src/main/webapp/css/administration.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/boats.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/boats.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/boats.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : boats Created on : 16 nov. 2009, 15:17:48 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ @@ -217,4 +244,4 @@ div#so-activity-calendar a.return:hover { text-decoration: underline; color: black; -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/css/boats.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : main Created on : 9 nov. 2009, 10:33:06 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Common style cheets for Wao */ Property changes on: trunk/wao-ui/src/main/webapp/css/common.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : contacts Created on : 18 nov. 2009, 17:16:26 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ Property changes on: trunk/wao-ui/src/main/webapp/css/contacts.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/main.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : main Created on : 9 nov. 2009, 10:41:41 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ @@ -169,4 +196,4 @@ div#so-footer p.cnil { font-size: 0.7em; -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/css/main.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : news Created on : 9 nov. 2009, 17:18:09 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ Property changes on: trunk/wao-ui/src/main/webapp/css/news.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/sampling.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/sampling.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/sampling.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : sampling Created on : 10 nov. 2009, 14:31:28 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Stylesheet for SamplingPlan and SampleRowForm pages */ @@ -301,4 +328,4 @@ margin-right: auto; margin-top: 20px; margin-bottom: 20px; -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/css/sampling.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : synthesis Created on : 19 nov. 2009, 18:36:39 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Purpose of the stylesheet follows. */ Property changes on: trunk/wao-ui/src/main/webapp/css/synthesis.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/css/userProfile.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,34 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Document : userProfile Created on : 10 nov. 2009, 18:47:30 - Author : fdesbois + Author : fdesbois <fdesbois at codelutin.com> Description: Stylesheet for userProfile page */ @@ -11,4 +38,4 @@ margin-left: auto; margin-right: auto; margin-top: 20px; -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/css/userProfile.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/favicon.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/MiniLogo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/accept-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/accept-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/accept.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/add-32px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/add.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/background.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/boat-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/boat.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/boat_old.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/calendar-unavailable.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/calendar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/chart-area.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/chart-bar.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/chart-line.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/clock-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/clock.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/comment-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/comment-invalid-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/comment-valid-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contact-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contact-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contact1-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contact1-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-full.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-reduce.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-termines.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-valides.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/delete-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/delete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/delete2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/dolphin-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/downarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/edit-32px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/edit-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/edit1-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/edit1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/empty-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/empty.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/exit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/eye-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/false-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/file-export-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/file-import-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/file-import1-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/fishing-net-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/go-home.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/help-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/help-22px_old.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/home.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/logo-gplv3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/logo-wao-48px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/logo-wao-48px_old.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/logo_WAO.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/preferences.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/refresh-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/refuse-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/refuse-unavailable-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/remove-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/sample-table.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/sampling.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-full.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/samplingPlan-reduce.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/save-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/save.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/search-32px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/search.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-full.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-reduce.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-table.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-termines.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-valides.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/samplingPlan-full.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/source/samplingPlan-reduce.xcf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/suppr-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/suppr-unavailable-16px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-graph-boarding.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-graph-sampling.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-allegro-reactivity.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-contact-states.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/synthesis-ind-non-compliance-boarding.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/text-32px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/text-access-32px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/true-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/undo-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/undo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/uparrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/user-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/main/webapp/img/user.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/FCKConf.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ FCKConfig.ToolbarCanCollapse = false; FCKConfig.ContextMenu = ["Link"]; FCKConfig.ToolbarSets["Default"] = [ @@ -4,4 +31,4 @@ ['Bold','Italic','Underline'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], ['Link','Unlink','Anchor'] -]; \ No newline at end of file +]; Property changes on: trunk/wao-ui/src/main/webapp/js/FCKConf.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,36 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +/** + * ZoneUpdater.js + * + * From <http://tinybits.blogspot.com/2009/05/update-zone-on-any-client-side-event.h…> + * by Inge Solvoll + */ var ZoneUpdater = Class.create(); ZoneUpdater.prototype = { @@ -100,4 +133,4 @@ } -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/dialog.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/dialog.js 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/js/dialog.js 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Dialogue de confirmation */ Property changes on: trunk/wao-ui/src/main/webapp/js/dialog.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ function openCommentWindow(window, commentPopupId, commentHiddenClass) { window.showCenter(true); var hidden = $$('.' + commentHiddenClass)[0]; @@ -23,4 +50,4 @@ } hidden.setValue(newValue); window.close(); -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/main/webapp/js/wao.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/site/rst/index.rst =================================================================== --- trunk/wao-ui/src/site/rst/index.rst 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/site/rst/index.rst 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +.. - +.. * #%L +.. * Wao :: Web Interface +.. * +.. * $Author$ +.. * $LastChangedDate$ +.. * $LastChangedRevision$ +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Accueil ======= Property changes on: trunk/wao-ui/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/site/site_fr.xml =================================================================== --- trunk/wao-ui/src/site/site_fr.xml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/site/site_fr.xml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,4 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <bannerLeft> Property changes on: trunk/wao-ui/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui; import com.formos.tapestry.testify.core.TapestryTester; @@ -19,11 +46,7 @@ * * Created: 13 avr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public abstract class AbstractApplicationTest extends TapestryTest { Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui.demo; @@ -9,11 +36,7 @@ * * Created: 13 avr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class DemoModule { Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,3 +1,30 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui.demo.pages; @@ -11,11 +38,7 @@ * * Created: 13 avr. 2010 * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * @author fdesbois <fdesbois at codelutin.com> */ public class LayoutDemo { Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml 2010-04-15 09:17:48 UTC (rev 448) @@ -1,5 +1,28 @@ -<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"> - <body> - OHO - </body> -</html> \ No newline at end of file + +<t:layout t:pageTitle="TEST LAYOUT" t:contentId="so-test" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" /> Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-14 14:35:27 UTC (rev 447) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-15 09:17:48 UTC (rev 448) @@ -1,7 +1,33 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Author$ + * $LastChangedDate$ + * $LastChangedRevision$ + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package test.fr.ifremer.wao.ui.pages; -//import fr.ifremer.wao.ui.AbstractApplicationTest; import com.formos.tapestry.testify.core.ForComponents; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; @@ -9,13 +35,11 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceNews; import fr.ifremer.wao.service.ServiceUser; -import fr.ifremer.wao.ui.services.WaoManager; import java.util.ArrayList; import test.fr.ifremer.wao.ui.AbstractApplicationTest; import java.util.HashMap; import java.util.Map; import org.apache.tapestry5.dom.Document; -import org.apache.tapestry5.dom.Element; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.ApplicationStateManager; import org.junit.*; @@ -26,12 +50,10 @@ /** * - * @author fdesbois + * @author fdesbois <fdesbois at codelutin.com> */ public class ConnectionTest extends AbstractApplicationTest { -// @Inject -// private Logger logger; private static final Logger logger = LoggerFactory.getLogger(ConnectionTest.class); @@ -87,4 +109,4 @@ } } -} \ No newline at end of file +} Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Property changes on: trunk/wao-ui/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

[Suiviobsmer-commits] r447 - in trunk/src/site: . resources resources/admin resources/coordinator resources/user rst rst/admin rst/coordinator rst/user
by jcouteau＠users.labs.libre-entreprise.org April 14, 2010

April 14, 2010

Author: jcouteau Date: 2010-04-14 14:35:27 +0000 (Wed, 14 Apr 2010) New Revision: 447 Log: Update doc Added: trunk/src/site/resources/admin/general_actions.png trunk/src/site/resources/coordinator/ trunk/src/site/resources/coordinator/comment_sampling_plan.png trunk/src/site/resources/user/actions.png trunk/src/site/rst/coordinator.rst trunk/src/site/rst/coordinator/ trunk/src/site/rst/coordinator/boats.rst trunk/src/site/rst/coordinator/contacts.rst trunk/src/site/rst/coordinator/echantillonage.rst trunk/src/site/rst/coordinator/syntheses.rst trunk/src/site/rst/observer.rst trunk/src/site/rst/user.rst Modified: trunk/src/site/resources/admin/users.png trunk/src/site/resources/user/syntheses.png trunk/src/site/rst/admin/contacts.rst trunk/src/site/rst/admin/echantillonage.rst trunk/src/site/rst/admin/syntheses.rst trunk/src/site/rst/admin/users.rst trunk/src/site/rst/user/contacts.rst trunk/src/site/rst/user/echantillonage.rst trunk/src/site/rst/user/syntheses.rst trunk/src/site/site_fr.xml Added: trunk/src/site/resources/admin/general_actions.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/admin/general_actions.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/resources/admin/users.png =================================================================== (Binary files differ) Added: trunk/src/site/resources/coordinator/comment_sampling_plan.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/coordinator/comment_sampling_plan.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/user/actions.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/user/actions.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/resources/user/syntheses.png =================================================================== (Binary files differ) Modified: trunk/src/site/rst/admin/contacts.rst =================================================================== --- trunk/src/site/rst/admin/contacts.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/admin/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -41,4 +41,10 @@ .. image:: validate_contacts.png :width: 800px - \ No newline at end of file + +Réduire la vue +============== + +Pour réduire la vue (n'afficher que les informations les plus pertinentes), +cliquez sur le lien correspondant. Vous pouvez revenir à la vue normale en +recliquant sur ce même lien. Modified: trunk/src/site/rst/admin/echantillonage.rst =================================================================== --- trunk/src/site/rst/admin/echantillonage.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/admin/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -24,7 +24,8 @@ ============================== Vous pouvez afficher le plan d'échantillonage sur une période de temps donnée -grace aux filtres situés au dessus du plan. +grace aux filtres situés au dessus du plan. Vous pouvez accéder aux filtres +avancés en cliquant sur le lien 'Recherche avancée'. Pour chaque ligne du plan, vous avez 4 actions disponibles : @@ -37,6 +38,15 @@ Ces actions peuvent être non disponible suivant le statut de la ligne. +Vous avez aussi 4 actions disponibles pour le plan : + +* Exporter le plan d'échantillonage +* Changer l'affichage de l'effort d'observation +* Réduire le plan d'échantillonage +* ajouter une nouvelle ligne + +.. image:: general_actions.png + Voir les navires elligibles pour la ligne ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -66,9 +76,30 @@ Cette action supprime la ligne du plan. -Ajouter une ligne du plan -,,,,,,,,,,,,,,,,,,,,,,,,, +Exporter le plan d'échantillonage +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +Cette action exporte le plan d'échantillonage affiché (pour les mêmes dates) au +format CSV + +Changer l'affichage de l'effort d'observation +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, + +Cette action change l'affichage de l'effort d'observation. Les deux modes +d'affichage disponible sont : + +* planifié (réalisé) +* planifié (réalisé + estimé) + +Réduire le plan d'échantillonage +,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, + +Cette action supprime de l'affichage certaines colonnes afin de ne garder à +l'écran que les informations principales + +Ajouter une nouvelle ligne +,,,,,,,,,,,,,,,,,,,,,,,,,, + Cette cinquième action est disponible à l'aide de l'icone 'plus' situé au-dessus, à droite du plan d'échantillonage. Modified: trunk/src/site/rst/admin/syntheses.rst =================================================================== --- trunk/src/site/rst/admin/syntheses.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/admin/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -1,9 +1,14 @@ Les synthèses ------------- -L'écran de synthèse permet de visualiser graphiquement la réalisation du plan -d'échantillonage. Vous pouvez filtrer par société, par façade, date, ... +L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs +tels que : -.. image:: synthese.png +- la réalisation du plan d'échantillonage. Vous pouvez filtrer par façade, date, ... +- la sollicitation des navires +- le non-respect du nombre d'observateurs embarqués +- l'état des contacts +- la réactivité de la saisie dans Allegro + +.. image:: ../user/syntheses.png :width: 800px - \ No newline at end of file Modified: trunk/src/site/rst/admin/users.rst =================================================================== --- trunk/src/site/rst/admin/users.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/admin/users.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -36,9 +36,9 @@ navigation, le nouvel ne sera pas sauvegardé à moins que vous ne cliquiez sur la disquette. -On peut rendre un utilisateur administrateur de l'application. Attention, il -est conseillé de réserver les droits d'administration à un très petit nombre de -personnes. +On peut choisir le rôle de l'utilisateur ainsi que sa visibilité (lecture seule +ou non). Un utilisateur en lecture seule ne pourra que consulter l'application, +il ne pourra y effectuer aucunne modification. Comme pour les sociétés, il est possible de rendre un utilisateur inactif. Un utilisateur inactif ne peut se connecter à l'application. @@ -56,4 +56,15 @@ le mot de passe est envoyé par e-mail à l'utilisateur (grace à son identifiant de connection). Si l'identifiant de connection n'est pas un e-mail, il est préférable de rentrer le mot de passe à la main et de le transmettre oralement à -l'utilsiateur. \ No newline at end of file +l'utilsiateur. + +Les roles +$$$$$$$$$ + +Il y a trois rôles disponibles : observateur, coordinateur et administrateur. Un +administrateur a accès a toutes les données de l'application, un observateur +peut créer des contacts, un coordinateur peut valider les données de sa société +et réaliser des imports/exports. + +Attention, il est conseillé de réserver les droits d'administration à un très +petit nombre de personnes. Added: trunk/src/site/rst/coordinator/boats.rst =================================================================== --- trunk/src/site/rst/coordinator/boats.rst (rev 0) +++ trunk/src/site/rst/coordinator/boats.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,7 @@ +Les navires +=========== + +L'écran des navires est le même pour un observateur et un coordinateur. Veuillez +vous référer à la `documentation observateur`_ pour plus d'informations. + +.. _documentation observateur: ../user/boats.html Added: trunk/src/site/rst/coordinator/contacts.rst =================================================================== --- trunk/src/site/rst/coordinator/contacts.rst (rev 0) +++ trunk/src/site/rst/coordinator/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,72 @@ +Gérer les contacts +================== + +La page des contacts reprends tous les contacts de la société. Il est possible +de modifier un contact pour mettre à jour son statut et les informations qui +lui sont associées et valider un embarquement. + +Modifier/mettre à jour un contact +--------------------------------- + +Pour modifier un contact, il faut cliquer sur l'icone 'modification'. Cela ouvre +la ligne du tableau en édition. Vous pouvez modifier le contact et enregistrer. + +.. image:: contacts_modification.png + :width: 800px + +Suivant le statut du contact, certaines informations sont nécessaires. Ces +informations sont vérifiées à l'enregistrement et un message vous indique les +informations manquantes si besoin. + +.. image:: contacts_verification.png + :width: 800px + +Supprimer un contact +-------------------- + +Il est possible de supprimer un contact non validé en cliquant sur l'icone +'poubelle' correspondant. + +Valider un embarquement +----------------------- + +Quand un contact est passé au statut 'Embarquement réalisé', il est possible de +le valider afin que l'embarquement soit comptabilisé comme réalisé. Pour ce +faire, il faut valider en cliquant sur l'icone de validation. Il est aussi +possible de refuser un embarquement réaliser en cliquant sur l'icone de refus. + +.. image:: contacts_validation.png + :width: 800px + +Il y a 2 validations : une validation venant de la société et une validation +venant des administrateurs. L'embarquement n'est compté comme réalisé qu'une +fois qu'il est complètement validé. + +Note : il est possible de changer sa validation tant qu'un embarquement n'est +pas validé par les deux parties en cliquant sur l'icone point d'interrogation. +Les lignes sur fond vert ne peuvent être modifiées. + +Importer les contacts +--------------------- + +Cliquez sur le lien import/export pour +afficher le formulaire approprié. Sélectionnez le fichier à importer et +validez (flèche vers le bas). + +Fichier d' import_ . + +.. _import: ../import/contacts.html + +Un message vous annonce le résultat de l'import. + +.. image:: ../admin/import_contacts_success.png + :width: 800px + +Exporter les contacts +--------------------- + +Cliquez sur le lien import/export pour +afficher le formulaire approprié. Cliquez sur la flèche vers le haut pour +télécharger un fichier csv contenant les contacts effectués. + +.. image:: ../admin/export_contacts.png Added: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst (rev 0) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,23 @@ +Le plan d'échantillonage +======================== + +L'écran du plan d'échantillonage vous permet de visualiser rapidement le plan +d'échantillonage, son avancement et les embarquements à réaliser. + +Le mois en cours est représenté en jaune dans le tableau. Dans chaque case du +plan d'échantillonage, sont indiqué le planifié et le réalisé entre parenthèses. +La couleur du nombre entre parenthèses indique si un déficit ou non +d'embarquement. + +A partir du plan d'échantillonage, il est possible de visionner les bateaux +susceptibles d'accueillir un observateur en cliqaunt sur l'icone 'bateau' à +droite du plan, pour la ligne concernée. + +.. image::../user/sampling_plan.png + :width: 800px + +Il est aussi possible d'envoyer un message aux administrateur à propos d'une +ligne du plan. Ce message est intégré à l'historique de le ligne du plan. + +.. image::comment_sampling_plan.png + :width: 800px Added: trunk/src/site/rst/coordinator/syntheses.rst =================================================================== --- trunk/src/site/rst/coordinator/syntheses.rst (rev 0) +++ trunk/src/site/rst/coordinator/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,15 @@ +Les synthèses +------------- + +L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs +tels que : + +- la réalisation du plan d'échantillonage. Vous pouvez filtrer par façade, date, ... +- la sollicitation des navires +- le non-respect du nombre d'observateurs embarqués +- l'état des contacts +- la réactivité de la saisie dans Allegro + +.. image:: ../user/syntheses.png + :width: 800px + Added: trunk/src/site/rst/coordinator.rst =================================================================== --- trunk/src/site/rst/coordinator.rst (rev 0) +++ trunk/src/site/rst/coordinator.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,18 @@ +Coordinateurs +------------- + +Cette documentation regroupe les actions disponibles pour les utilisateurs ayant +le rôle 'coordinateur' : + +* `Le plan dechantillonage`_ +* `La base des navires`_ +* `Les contacts`_ +* `Les syntheses`_ + +.. _Le plan dechantillonage:: coordinator/echantillonage.html + +.. _La base des navires:: coordinator/boats.html + +.. _Les contacts:: coordinator/contacts.html + +.. _Les syntheses:: coordinator/syntheses.html Added: trunk/src/site/rst/observer.rst =================================================================== --- trunk/src/site/rst/observer.rst (rev 0) +++ trunk/src/site/rst/observer.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,17 @@ +Observateurs +------------ + +Cette documentation regroupe les actions disponibles pour les utilisateurs ayant +le rôle 'observateur' : + +* `Le plan dechantillonage`_ +* `La base des navires`_ +* `Les contacts`_ +* `Les syntheses`_ +* `Creer un contact`_ + +.. _Le plan dechantillonage:: user/echantillonage.html +.. _La base des navires:: user/boats.html +.. _Les contacts:: user/contacts.html +.. _Les syntheses:: user/syntheses.html +.. _Creer un contact:: user/createAContact.html Modified: trunk/src/site/rst/user/contacts.rst =================================================================== --- trunk/src/site/rst/user/contacts.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/user/contacts.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -3,7 +3,7 @@ La page des contacts reprends tous les contacts de la société. Il est possible de modifier un contact pour mettre à jour son statut et les informations qui -lui sont associées et valider un embarquement. +lui sont associées. Modifier/mettre à jour un contact --------------------------------- @@ -26,22 +26,3 @@ Il est possible de supprimer un contact non validé en cliquant sur l'icone 'poubelle' correspondant. - -Valider un embarquement (coordinateur) --------------------------------------- - -Quand un contact est passé au statut 'Embarquement réalisé', il est possible de -le valider afin que l'embarquement soit comptabilisé comme réalisé. Pour ce -faire, il faut valider en cliquant sur l'icone de validation. Il est aussi -possible de refuser un embarquement réaliser en cliquant sur l'icone de refus. - -.. image:: contacts_validation.png - :width: 800px - -Il y a 2 validations : une validation venant de la société et une validation -venant des administrateurs. L'embarquement n'est compté comme réalisé qu'une -fois qu'il est complètement validé. - -Note : il est possible de changer sa validation tant qu'un embarquement n'est -pas validé par les deux parties en cliquant sur l'icone point d'interrogation. -Les lignes sur fond vert ne peuvent être modifiées. \ No newline at end of file Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/user/echantillonage.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -6,14 +6,30 @@ Le mois en cours est représenté en jaune dans le tableau. Dans chaque case du plan d'échantillonage, sont indiqué le planifié et le réalisé entre parenthèses. -La couleur du nombre entre parenthèses indique si un déficit ou non +La couleur du nombre entre parenthèses indique si il y a un déficit ou non d'embarquement. +Vous pouvez filtrer l'affichage du plan d'échantillonage à l'aide des filtres +situés au dessus du plan d'échantillonage. Pour accéder aux filtres avancées, +cliquez sur le lien 'Recherche avancée'. + A partir du plan d'échantillonage, il est possible de visionner les bateaux -susceptibles d'accueillir un observateur en cliqaunt sur l'icone 'bateau' à +susceptibles d'accueillir un observateur en cliquant sur l'icone 'bateau' à droite du plan, pour la ligne concernée. .. image::sampling_plan.png :width: 800px +Actions disponibles +,,,,,,,,,,,,,,,,,,, +Plusieurs actions sont disponibles sur le plan d'échantillonage. Vous pouvez y +accéder grace aux icones situés à côté du titre de la page. + +.. image::actions.png + +* Exporter le plan d'échantillonage en CSV (non accessible en lecture seule) +* Changer l'affichage de l'effort d'observation + + + Modified: trunk/src/site/rst/user/syntheses.rst =================================================================== --- trunk/src/site/rst/user/syntheses.rst 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/rst/user/syntheses.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -1,10 +1,15 @@ Les synthèses ------------- -L'écran de synthèse permet de visualiser graphiquement la réalisation du plan -d'échantillonage. Vous pouvez filtrer par façade, date, ... +L'écran de synthèse permet de visualiser graphiquement plusieurs indicateurs +tels que : +- la réalisation du plan d'échantillonage. Vous pouvez filtrer par façade, date, ... +- la sollicitation des navires +- le non-respect du nombre d'observateurs embarqués +- l'état des contacts +- la réactivité de la saisie dans Allegro + .. image:: syntheses.png :width: 800px - \ No newline at end of file Added: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst (rev 0) +++ trunk/src/site/rst/user.rst 2010-04-14 14:35:27 UTC (rev 447) @@ -0,0 +1,13 @@ +Utilisateurs +------------ + +Cette documentation regroupe toutes les actions communes à tous les +utilisateurs : + +* `Se connecter`_ +* `Compte utilisateur`_ +* `La page d'accueil`_ + +.. _Se connecter:: user/authentication.html +.. _Compte utilisateur:: user/account.html +.. _La page daccueil:: user/news.html Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-14 10:23:08 UTC (rev 446) +++ trunk/src/site/site_fr.xml 2010-04-14 14:35:27 UTC (rev 447) @@ -41,10 +41,14 @@ <item name="Gérer la page d'accueil" href="admin/news.html"/> </item> - <item name="Utilisateur" href="#"> + <item name="Utilisateur" href="user.html"> <item name="Se connecter" href="user/authentication.html"/> <item name="Mon compte utilisateur" href="user/account.html"/> <item name="La page d'accueil" href="user/news.html"/> + + </item> + + <item name="Observateur" href="observer.html"> <item name="Le plan d'échantillonage" href="user/echantillonage.html"/> <item name="La base des navires" href="user/boats.html"/> <item name="Les contacts" href="user/contacts.html"/> @@ -52,12 +56,20 @@ <item name="Créer un contact" href="user/createAContact.html"/> </item> + <item name="Coordinateur" href="coordinator.html"> + <item name="Le plan d'échantillonage" href="coordinator/echantillonage.html"/> + <item name="La base des navires" href="coordinator/boats.html"/> + <item name="Les contacts" href="coordinator/contacts.html"/> + <item name="Les synthèses" href="coordinator/syntheses.html"/> + </item> + <item name="Import/Export" href="import/samplingPlan.html"> <item name="Plan d'échantillonnage" href="import/samplingPlan.html"/> <item name="Navires" href="import/boats.html"/> <item name="Contacts" href="import/contacts.html"/>  </item> + <item name="Conception/Données" href="usecases.html"> <item name="Cas d'utilisations" href="usecases.html"/> <item name="Règles métier" href="business-rules.html" />

1 0

[Suiviobsmer-commits] r446 - in trunk: wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp wao-ui/src/main/webapp/img wao-ui/src/main/webapp/img/source wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org April 14, 2010

April 14, 2010

Author: fdesbois Date: 2010-04-14 10:23:08 +0000 (Wed, 14 Apr 2010) New Revision: 446 Log: Add interactions to switch calcul on sampleMonth (estimated or real) Added: trunk/wao-ui/src/main/webapp/img/contacts-termines.png trunk/wao-ui/src/main/webapp/img/contacts-valides.png trunk/wao-ui/src/main/webapp/img/source/contacts-termines.xcf trunk/wao-ui/src/main/webapp/img/source/contacts-valides.xcf Modified: trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-13 21:30:57 UTC (rev 445) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-14 10:23:08 UTC (rev 446) @@ -108,7 +108,7 @@ logger.debug("Initialize page from Layout"); logger.debug("currentUserExists : " + isCurrentUserExists()); } - //page.initialize(); + page.initialize(); } boolean afterRender() { Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-13 21:30:57 UTC (rev 445) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-14 10:23:08 UTC (rev 446) @@ -86,7 +86,7 @@ } @Inject - private Logger log; + private Logger logger; @Inject private ServiceSampling serviceSampling; @@ -269,6 +269,14 @@ fullView = !fullView; } + void onActionFromChangeFilterEstimatedTides() { + boolean oldValue = getFilter().getEstimatedTides(); + if (logger.isDebugEnabled()) { + logger.debug("Change estimatedTides in filter to : " + !oldValue); + } + getFilter().setEstimatedTides(!oldValue); + } + /**************************** MAIN TABLE **********************************/ /** ------------------------- DATA ------------------------------------- **/ Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-13 21:30:57 UTC (rev 445) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-14 10:23:08 UTC (rev 446) @@ -25,6 +25,18 @@ title="Exporter le plan d'échantillonnage du ${dateFormat.format(period.fromDate)} au ${dateFormat.format(period.thruDate)}" /> </a> </span> + <span> + <a t:type="actionlink" t:id="changeFilterEstimatedTides"> + <t:if t:test="filter.estimatedTides"> + <img src="${asset:context:img/true-22px.png}" alt="Effort d'observations réalisé pour contacts validés" + title="Afficher l'effort d'observations réalisé pour les contacts validés seulement" /> + <p:else> + <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations réalisé pour contacts terminés" + title="Afficher l'effort d'observations réalisé pour les contacts validés + celui estimé pour les contacts non validés" /> + </p:else> + </t:if> + </a> + </span> <t:if t:test="user.admin"> <span> <a t:type="actionlink" t:id="toggleDisplayMode"> @@ -104,7 +116,10 @@ <thead> <tr class="main"> <td colspan="${nbColumnsForProfession}">Métiers échantillonnés</td> - <td colspan="${nbColumnsForMonths}">Effort d'observation en nombre de marées [ planifié <em>(réalisé)</em> ]</td> + <td colspan="${nbColumnsForMonths}"> + Effort d'observation en nombre de marées + [ planifié <em>(réalisé <t:if t:test="filter.estimatedTides">+ estimé</t:if>)</em> ] + </td> <td colspan="${nbColumnsForOther}">Autres</td> </tr> <tr> Added: trunk/wao-ui/src/main/webapp/img/contacts-termines.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-termines.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/contacts-valides.png =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/contacts-valides.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/source/contacts-termines.xcf =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-termines.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/wao-ui/src/main/webapp/img/source/contacts-valides.xcf =================================================================== (Binary files differ) Property changes on: trunk/wao-ui/src/main/webapp/img/source/contacts-valides.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-13 21:30:57 UTC (rev 445) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-14 10:23:08 UTC (rev 446) @@ -73,7 +73,6 @@ connectUser(page); } - // TEMP : waiting for better solution using stateManager through Layout private void connectUser(Document page) throws WaoException, WaoBusinessException { when(serviceUser.connect("jmichmuche", "password")).thenReturn(user);

1 0

[Suiviobsmer-commits] r445 - in trunk: . wao-ui wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/webapp wao-ui/src/test/java wao-ui/src/test/java/test wao-ui/src/test/java/test/fr wao-ui/src/test/java/test/fr/ifremer wao-ui/src/test/java/test/fr/ifremer/wao wao-ui/src/test/java/test/fr/ifremer/wao/ui wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo wao-ui/src/test/java/test/fr/ifremer/wao/ui/
by fdesbois＠users.labs.libre-entreprise.org April 13, 2010

April 13, 2010

Author: fdesbois Date: 2010-04-13 21:30:57 +0000 (Tue, 13 Apr 2010) New Revision: 445 Log: - Use testify to create test for Tapestry pages/components - Try to use DemoModule + LayoutDemo page to test Layout component - Test on connection (using StateManager and manually connection with form submission) - Problem on SessionState user not present in Layout when loading the page --> need more explanation on Testify/PageTester Added: trunk/wao-ui/src/test/java/test/ trunk/wao-ui/src/test/java/test/fr/ trunk/wao-ui/src/test/java/test/fr/ifremer/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/components/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/data/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java Modified: trunk/pom.xml trunk/wao-ui/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/Index.tml trunk/wao-ui/src/test/resources/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/pom.xml 2010-04-13 21:30:57 UTC (rev 445) @@ -101,7 +101,25 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.formos.tapestry</groupId> + <artifactId>tapestry-testify</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.8.4</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -216,7 +234,7 @@  <i18n.version>1.2.1</i18n.version> - <nuitonutils.version>1.2.2-SNAPSHOT</nuitonutils.version> + <nuitonutils.version>1.2.2</nuitonutils.version> <topia.version>2.3.3-SNAPSHOT</topia.version> <eugene.version>2.0.1-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/pom.xml 2010-04-13 21:30:57 UTC (rev 445) @@ -56,21 +56,22 @@ <artifactId>jfreechart</artifactId> </dependency>  - <dependency> + + <dependency> <groupId>com.formos.tapestry</groupId> <artifactId>tapestry-testify</artifactId> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - </dependency>--> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>4.7</version> </dependency>  <dependency> @@ -137,6 +138,25 @@ </overlays> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>default-client</id> + +  + </execution> + </executions> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> </build> Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-13 21:30:57 UTC (rev 445) @@ -106,6 +106,7 @@ } if (logger.isDebugEnabled()) { logger.debug("Initialize page from Layout"); + logger.debug("currentUserExists : " + isCurrentUserExists()); } //page.initialize(); } @@ -264,9 +265,15 @@ @Log Object onSuccessFromConnexionForm() throws WaoException { try { - // FIXME-FD20100120 Problem with NPE in Topia --> see Ano #243 on nuiton.org + if (logger.isDebugEnabled()) { + logger.debug("Login : " + login); + } if (login != null && password != null) { currentUser = serviceUser.connect(login, password); + if (logger.isDebugEnabled()) { + logger.debug("User connected : " + + currentUser.getFullName()); + } } } catch (WaoBusinessException eee) { if (eee.getType().equals(Type.BAD_CONNECTION)) { @@ -275,6 +282,9 @@ } else if (eee.getType().equals(Type.ILLEGAL_CONNECTION)) { connexionFeedback.addInfo(eee.getMessage()); } + if (logger.isDebugEnabled()) { + logger.error("WaoBusinessException : " + eee.getMessage(), eee); + } } return null; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-13 21:30:57 UTC (rev 445) @@ -120,6 +120,7 @@ void setupRender() throws WaoException { if (log.isDebugEnabled()) { log.debug("RESET DATA"); + log.debug("User : " + user.getFullName()); } contacts = null; contactsForm.clearErrors(); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml 2010-04-13 21:30:57 UTC (rev 445) @@ -1,12 +1,12 @@ <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <t:if t:test="empty"> - <img src="${asset:context:}/img/help-22px.png" title="${emptyTitle}" /> + <img src="${asset:context:img/help-22px.png}" title="${emptyTitle}" /> <p:else> <t:if t:test="value"> - <img src="${asset:context:}/img/true-22px.png" title="${trueTitle}" /> + <img src="${asset:context:img/true-22px.png}" title="${trueTitle}" /> <p:else> - <img src="${asset:context:}/img/false-22px.png" title="${falseTitle}" /> + <img src="${asset:context:img/false-22px.png}" title="${falseTitle}" /> </p:else> </t:if> </p:else> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-04-13 21:30:57 UTC (rev 445) @@ -3,9 +3,9 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>WAO - Web Applicatif Obsmer : ${pageTitle}</title> - <link rel="stylesheet" type="text/css" href="${asset:context:}/css/common.css" /> - <link rel="stylesheet" type="text/css" href="${asset:context:}/css/main.css" /> - <script type="text/javascript" src="${asset:context:}/js/wao.js"/> + <link rel="stylesheet" type="text/css" href="${asset:context:css/common.css}" /> + <link rel="stylesheet" type="text/css" href="${asset:context:css/main.css}" /> + <script type="text/javascript" src="${asset:context:js/wao.js}"/> </head> <t:if t:test="currentUserExists"> <body> @@ -25,12 +25,12 @@ <div id="so-session" class="clearfix"> <div class="fleft"> <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:}/img/logo-wao-48px.png" alt="WAO logo" title="Retourner sur la page d'accueil"/> + <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur la page d'accueil"/> </a>  </div> <div class="fleft"> <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> - <img src="${asset:context:}/img/MiniLogo.jpg" alt="Obsmer logo"/> + <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> </a> </div> <div id="user-infos" class="fleft"> @@ -39,13 +39,13 @@ </div> <div id="user-actions" class="fright"> <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:}/img/home.png" alt="Accueil" title="Page d'accueil" /> + <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> </a> <a t:type="pagelink" t:page="userProfile" title="Gestion profil"> - <img src="${asset:context:}/img/user.png" alt="Preferences" title="Gestion profil"/> + <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> </a> <a t:type="actionlink" t:id="exit" title="Déconnexion"> - <img src="${asset:context:}/img/exit.png" alt="Exit" title="Déconnexion"/> + <img src="${asset:context:img/exit.png}" alt="Exit" title="Déconnexion"/> </a> </div> </div> @@ -140,7 +140,7 @@ </div> </div> <div class="fright" id="so-connexion-logo"> - <img src="${asset:context:}/img/logo-wao-48px.png" alt="Logo Obsmer"/> + <img src="${asset:context:img/logo-wao-48px.png}" alt="Logo Obsmer"/> </div> </form> </div> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-04-13 21:30:57 UTC (rev 445) @@ -73,12 +73,12 @@ <label>Observations: </label> <input t:type="checkbox" t:id="mammalsObservation1" value="contactFilter.mammalsObservation" /> <t:label t:for="mammalsObservation1"> - <img src="${asset:context:}/img/eye-22px.png" alt="Observations" title="Observations" /> + <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> </t:label>  <label>Captures acc.: </label> <input t:type="checkbox" t:id="mammalsCapture1" value="contactFilter.mammalsCapture" /> <t:label t:for="mammalsCapture1"> - <img src="${asset:context:}/img/fishing-net-22px.png" alt="Captures" title="Captures" /> + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> </t:label> </div><p> </p> <div> @@ -87,29 +87,29 @@ <label>Validation société: </label> <input t:type="checkbox" t:id="companyAccepted" value="contactFilter.companyAccepted" /> <t:label t:for="companyAccepted"> - <img src="${asset:context:}/img/true-22px.png" title="Accepté par la société" /> + <img src="${asset:context:img/true-22px.png}" title="Accepté par la société" /> </t:label>  <input t:type="checkbox" t:id="companyRefused" value="contactFilter.companyRefused" /> <t:label t:for="companyRefused"> - <img src="${asset:context:}/img/false-22px.png" title="Refusé par la société" /> + <img src="${asset:context:img/false-22px.png}" title="Refusé par la société" /> </t:label>  <input t:type="checkbox" t:id="companyUndefined" value="contactFilter.companyUndefined" /> <t:label t:for="companyUndefined"> - <img src="${asset:context:}/img/help-22px.png" title="Non validé par la société" /> + <img src="${asset:context:img/help-22px.png}" title="Non validé par la société" /> </t:label>  <label>Validation programme: </label> <input t:type="checkbox" t:id="programAccepted" value="contactFilter.programAccepted" /> <t:label t:for="programAccepted"> - <img src="${asset:context:}/img/true-22px.png" title="Accepté par le programme" /> + <img src="${asset:context:img/true-22px.png}" title="Accepté par le programme" /> </t:label>  <input t:type="checkbox" t:id="programRefused" value="contactFilter.programRefused" /> <t:label t:for="programRefused"> - <img src="${asset:context:}/img/false-22px.png" title="Refusé par le programme" /> + <img src="${asset:context:img/false-22px.png}" title="Refusé par le programme" /> </t:label>  <input t:type="checkbox" t:id="programUndefined" value="contactFilter.programUndefined" /> <t:label t:for="programUndefined"> - <img src="${asset:context:}/img/help-22px.png" title="Non validé par le programme" /> + <img src="${asset:context:img/help-22px.png}" title="Non validé par le programme" /> </t:label>  </div> @@ -132,7 +132,7 @@ <input t:type="upload" t:id="contactsCsvFile" t:validate="required" /> <input t:type="submit" class="ico import" value="OK" title="Importer une liste de contacts (format CSV avec encodage UTF-8)" /> <a t:type="actionlink" t:id="exportShowContacts"> - <img src="${asset:context:}/img/file-export-22px.png" alt="Export" + <img src="${asset:context:img/file-export-22px.png}" alt="Export" title="Exporter les ${contacts.availableRows} contacts trouvés ${tooltipExportFrom}" /> </a> </form> @@ -197,20 +197,20 @@ <t:if t:test="editionMode"> <input t:type="checkbox" t:id="mammalsObservation" value="contactEdited.mammalsObservation"/> <t:label t:for="mammalsObservation"> - <img src="${asset:context:}/img/eye-22px.png" alt="Observations" + <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> </t:label>  <input t:type="checkbox" t:id="mammalsCapture" value="contactEdited.mammalsCapture" /> <t:label t:for="mammalsCapture"> - <img src="${asset:context:}/img/fishing-net-22px.png" alt="Captures" + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> </t:label> <p:else> <t:if t:test="contact.mammalsObservation"> - <img src="${asset:context:}/img/eye-22px.png" alt="Observations" title="Observations" />  + <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  </t:if> <t:if t:test="contact.mammalsCapture"> - <img src="${asset:context:}/img/fishing-net-22px.png" alt="Captures" title="Captures" /> + <img src="${asset:context:img/fishing-net-22px.png}" alt="Captures" title="Captures" /> </t:if> </p:else> </t:if> @@ -233,7 +233,7 @@ <t:if t:test="editionMode">  <a href="#" onclick="openCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()})"> - <img src="${asset:context:}/img/comment-22px.png" id="commentImg" alt="Add comment" /> + <img src="${asset:context:img/comment-22px.png}" id="commentImg" alt="Add comment" /> </a>  @@ -246,9 +246,10 @@ </p> <p> </p> <p class="aright"> - <a onclick="closeCommentWindow(windowComment, 'commentPopup', 'contact-comment', ${contact.contactState.isUnfinishedState()}, 'commentImg', '${asset:context:}')" class="save"> - <img src="${asset:context:}/img/save-22px.png" alt="Save comment" title="Enregistrer le commentaire"/> - </a>  + +   </p> </div> @@ -278,8 +279,8 @@ </t:if> <p:else> <t:unless t:test="user.admin"> - <img src="${asset:context:}/img/edit-unavailable-22px.png" alt="Edit unavailable" title="Edition du contact indisponible"/> - <img src="${asset:context:}/img/delete-unavailable-22px.png" alt="Delete unavailable" title="Suppression du contact indisponible"/> + <img src="${asset:context:img/edit-unavailable-22px.png}" alt="Edit unavailable" title="Edition du contact indisponible"/> + <img src="${asset:context:img/delete-unavailable-22px.png}" alt="Delete unavailable" title="Suppression du contact indisponible"/> </t:unless> </p:else> </t:if> @@ -291,8 +292,8 @@ t:context="contact.topiaId" title="Refuser le contact" /> <p:else> <t:unless t:test="canUnvalidate()"> - <img src="${asset:context:}/img/accept-unavailable-22px.png" alt="Accept unavailable" title="Validation du contact indisponible"/> - <img src="${asset:context:}/img/refuse-unavailable-22px.png" alt="Refuse unavailable" title="Refus du contact indisponible"/> + <img src="${asset:context:img/accept-unavailable-22px.png}" alt="Accept unavailable" title="Validation du contact indisponible"/> + <img src="${asset:context:img/refuse-unavailable-22px.png}" alt="Refuse unavailable" title="Refus du contact indisponible"/> </t:unless> </p:else> </t:if> Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-04-13 21:30:57 UTC (rev 445) @@ -5,7 +5,7 @@ <t:if t:test="canEditNews()"> <p class="aright"> <a t:type="actionlink" t:id="addNews"> - <img src="${asset:context:}/img/add-32px.png" alt="Ajouter" title="Ajouter un nouvel article"/> + <img src="${asset:context:img/add-32px.png}" alt="Ajouter" title="Ajouter un nouvel article"/> </a> </p> </t:if> @@ -33,15 +33,15 @@ <input t:type="submitContext" t:context="rowIndex" t:id="saveNews" class="ico22px save22px" value="Save" title="Enregistrer les modifications" />  <a t:type="actionlink" t:id="cancelEdit"> - <img src="${asset:context:}/img/undo-22px.png" title="Annuler les modifications"/> + <img src="${asset:context:img/undo-22px.png}" title="Annuler les modifications"/> </a> <p:else> <a t:type="actionlink" t:id="editNews" t:context="rowIndex" title="Modifier l'article"> - <img src="${asset:context:}/img/edit.png" alt="Edit" /> + <img src="${asset:context:img/edit.png}" alt="Edit" /> </a>  <a t:type="actionlink" t:id="deleteNews" t:context="rowIndex" title="Supprimer l'article" t:mixins="confirm" t:message="Etes-vous sûr de vouloir supprimer définitivement cet article ?"> - <img src="${asset:context:}/img/delete2.png" alt="Delete" /> + <img src="${asset:context:img/delete2.png}" alt="Delete" /> </a> </p:else> </t:if> Added: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java (rev 0) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-04-13 21:30:57 UTC (rev 445) @@ -0,0 +1,64 @@ +package test.fr.ifremer.wao.ui; + +import com.formos.tapestry.testify.core.TapestryTester; +import com.formos.tapestry.testify.junit4.TapestryTest; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.WaoUser; +import test.fr.ifremer.wao.ui.demo.DemoModule; +import fr.ifremer.wao.ui.services.AppModule; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.ApplicationStateManager; +import org.mockito.MockitoAnnotations; +import org.mockito.Mock; +import static org.mockito.Mockito.*; + + +/** + * AbstractApplicationTest + * + * Created: 13 avr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public abstract class AbstractApplicationTest extends TapestryTest { + +// @Inject +// private Logger logger; + + private static final TapestryTester SHARED_TESTER = + new TapestryTester( + "fr.ifremer.wao.ui", AppModule.class, DemoModule.class); + + public AbstractApplicationTest() { + super(SHARED_TESTER); + } + + @Override + protected void setUpForAllTestMethods() throws Exception { + MockitoAnnotations.initMocks(this); + } + + @Mock + protected WaoUser user; + + @Inject + private ApplicationStateManager stateManager; + + protected void prepareObserverUser(boolean contributeSession) { + Company company = mock(Company.class); + when(company.getName()).thenReturn("TARTANPION"); + + when(user.getFullName()).thenReturn("Jean Michmuche"); + when(user.isAdmin()).thenReturn(false); + when(user.getUserRole()).thenReturn(UserRole.OBSERVER); + when(user.getCompany()).thenReturn(company); + if (contributeSession) { + stateManager.set(WaoUser.class, user); + } + } +} Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java (rev 0) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-04-13 21:30:57 UTC (rev 445) @@ -0,0 +1,25 @@ + +package test.fr.ifremer.wao.ui.demo; + +import org.apache.tapestry5.ioc.Configuration; +import org.apache.tapestry5.services.LibraryMapping; + +/** + * DemoModule + * + * Created: 13 avr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class DemoModule { + + public static void contributeComponentClassResolver( + Configuration<LibraryMapping> configuration) { + configuration.add(new LibraryMapping("demo", + DemoModule.class.getPackage().getName())); + } +} Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java (rev 0) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-04-13 21:30:57 UTC (rev 445) @@ -0,0 +1,34 @@ + +package test.fr.ifremer.wao.ui.demo.pages; + +import fr.ifremer.wao.entity.WaoUser; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +/** + * LayoutDemo + * + * Created: 13 avr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class LayoutDemo { + + @Inject + private Logger logger; + + @SessionState + private WaoUser user; + + void setupRender() { + if (logger.isDebugEnabled()) { + logger.debug("User connected : " + user); + } + } + +} Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml (rev 0) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml 2010-04-13 21:30:57 UTC (rev 445) @@ -0,0 +1,5 @@ +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd"> + <body> + OHO + </body> +</html> \ No newline at end of file Added: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java (rev 0) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-13 21:30:57 UTC (rev 445) @@ -0,0 +1,91 @@ + +package test.fr.ifremer.wao.ui.pages; + +//import fr.ifremer.wao.ui.AbstractApplicationTest; +import com.formos.tapestry.testify.core.ForComponents; +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.entity.News; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.service.ServiceNews; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.services.WaoManager; +import java.util.ArrayList; +import test.fr.ifremer.wao.ui.AbstractApplicationTest; +import java.util.HashMap; +import java.util.Map; +import org.apache.tapestry5.dom.Document; +import org.apache.tapestry5.dom.Element; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.ApplicationStateManager; +import org.junit.*; +import org.mockito.Mock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import static org.mockito.Mockito.*; + +/** + * + * @author fdesbois + */ +public class ConnectionTest extends AbstractApplicationTest { + +// @Inject +// private Logger logger; + private static final Logger logger = + LoggerFactory.getLogger(ConnectionTest.class); + + @ForComponents + @Mock + private ServiceUser serviceUser; + + @ForComponents + @Mock + private ServiceNews serviceNews; + + @Inject + private ApplicationStateManager stateManager; + + @Test + public void testObserverSession() + throws WaoException, WaoBusinessException { + if (logger.isInfoEnabled()) { + logger.info("testObserverSession"); + } + prepareObserverUser(true); + WaoUser sso = stateManager.getIfExists(WaoUser.class); + Assert.assertNotNull(sso); + Assert.assertFalse(sso.isAdmin()); + } + + @Test + public void testConnection() throws WaoException, WaoBusinessException { + if (logger.isInfoEnabled()) { + logger.info("testConnection"); + } + when(serviceNews.getNews()).thenReturn(new ArrayList<News>()); + Document page = tester.renderPage("Index"); + if (logger.isInfoEnabled()) { + logger.info("Content : " + page.getRootElement()); + } + + prepareObserverUser(false); + connectUser(page); + } + + // TEMP : waiting for better solution using stateManager through Layout + private void connectUser(Document page) + throws WaoException, WaoBusinessException { + when(serviceUser.connect("jmichmuche", "password")).thenReturn(user); + + Map<String, String> fieldValues = new HashMap<String, String>(); + fieldValues.put("login", "jmichmuche"); + fieldValues.put("password", "password"); + Document result = tester.submitForm( + page.getElementById("connexionForm"), fieldValues); + if (logger.isInfoEnabled()) { + logger.info("Content : " + result.getRootElement()); + } + } + +} \ No newline at end of file Property changes on: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-ui/src/test/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/test/resources/log4j.properties 2010-04-13 21:30:53 UTC (rev 444) +++ trunk/wao-ui/src/test/resources/log4j.properties 2010-04-13 21:30:57 UTC (rev 445) @@ -6,3 +6,6 @@ log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n #log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss} %5p (%F:%L) %m%n log4j.appender.console.Threshold=DEBUG + +log4j.logger.test.fr.ifremer.wao=DEBUG +log4j.logger.fr.ifremer.wao=DEBUG

1 0

[Suiviobsmer-commits] r444 - trunk/wao-ui/src/test/java
by fdesbois＠users.labs.libre-entreprise.org April 13, 2010

April 13, 2010

Author: fdesbois Date: 2010-04-13 21:30:53 +0000 (Tue, 13 Apr 2010) New Revision: 444 Log: - Use testify to create test for Tapestry pages/components - Try to use DemoModule + LayoutDemo page to test Layout component - Test on connection (using StateManager and manually connection with form submission) - Problem on SessionState user not present in Layout when loading the page --> need more explanation on Testify/PageTester Removed: trunk/wao-ui/src/test/java/fr/

1 0