Wao-commits

Download

wao-commits@list.forge.codelutin.com

2352 discussions

[Suiviobsmer-commits] r653 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp/js
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 16:15:23 +0000 (Sun, 03 Oct 2010) New Revision: 653 Log: Ano #2440 : Improve restriction on comment needed for unfinished state Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/js/contacts.js 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-10-03 15:59:15 UTC (rev 652) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-03 16:15:23 UTC (rev 653) @@ -87,7 +87,9 @@ * Created: 9 nov. 2009 * * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ */ + at SuppressWarnings({"UnusedDeclaration"}) @RequiresAuthentication({UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) @IncludeStylesheet("context:css/contacts.css") @IncludeJavaScriptLibrary("context:js/contacts.js") @@ -259,7 +261,7 @@ @Override public InputStream getStream() throws IOException { - InputStream result = null; + InputStream result; try { result = serviceContact.exportContactCsv( getContactFilter()); @@ -428,6 +430,9 @@ @Persist private String oldComment; + @Persist + private ContactState oldState; + public boolean hasActions() { return !user.isAdmin() && contact.getValidationCompany() == null && !user.isReadOnly(); @@ -541,6 +546,7 @@ //contactEditedId = contactId; contactSelectedId = contactId; oldComment = contactEdited.getComment(); + oldState = contactEdited.getContactState(); edited = true; } @@ -681,8 +687,14 @@ // Non abouti, Refus ou Refus Définitif if (contactState.isUnfinishedState()) { String newComment = contactEdited.getComment(); - if (StringUtils.isNotEmpty(newComment) && - !newComment.equals(oldComment)) { + + boolean commentChanged = + StringUtils.isNotEmpty(newComment) && + !newComment.equals(oldComment); + + // Ano #2440 : no restriction if previous state is unfinished + if (oldState.isUnfinishedState() || commentChanged) { + // RAZ des champs contactEdited.setTideBeginDate(null); contactEdited.setTideEndDate(null); Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 15:59:15 UTC (rev 652) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 16:15:23 UTC (rev 653) @@ -46,10 +46,10 @@ */ openWindow: function(contact) { this.editionMode = contact.edited; - this.oldComment = contact.comment; - this.contactUnfinished = contact.unfinished; + this.oldContact = contact; - this.commentForm.editComment.setValue(this.oldComment); + // Edit current comment from contactForm + this.commentForm.editComment.setValue($F(this.contactForm.comment)); this.commentForm.hiddenContactId.setValue(contact.id); this.window.showCenter(true); @@ -66,31 +66,54 @@ this.commentForm.submit(); } else { // Refresh edition form with comment - this.newComment = $F(this.commentForm.editComment); - this.refreshCommentImage(); - this.contactForm.comment.setValue(this.newComment); + var newComment = $F(this.commentForm.editComment); + this.refreshCommentImage(newComment && this.oldContact.comment != newComment); + this.contactForm.comment.setValue(newComment); } this.window.close(); }, /** + * Return true if current state has changed and becomes unfinished + */ + isCommentMandatory: function() { + + var previouslyUnfinished = this.oldContact.unfinished; + var currentState = $F(this.contactForm.contactState); + + var becomesUnfinished = currentState == 'BOAT_UNAVAILABLE' || + currentState == 'BOAT_REFUSED' || + currentState == 'BOAT_DEFINITIVE_REFUSED'; + + return becomesUnfinished && !previouslyUnfinished; + }, + /** * Refresh the comment image (only in edition mode) :: * Depends on contactUnfinished value to know if errors can occurs on comment + * provides by return value of isCommentMandatory() function. + * - param : commentChanged boolean, true if comment has changed */ - refreshCommentImage: function() { - if (this.contactUnfinished && (!this.newComment || this.oldComment == this.newComment)) { + refreshCommentImage: function(commentChanged) { + + // VALID + if (commentChanged) { + this.showImage(this.validImage); + this.hideImage(this.invalidImage); + this.hideImage(this.image); + + // INVALID + } else if (this.isCommentMandatory()) { this.showImage(this.invalidImage); this.hideImage(this.validImage); this.hideImage(this.image); - } else if (this.oldComment != this.newComment) { - this.showImage(this.validImage); - this.hideImage(this.invalidImage); - this.hideImage(this.image); + + // NO_CHANGE } else { this.showImage(this.image); + this.hideImage(this.invalidImage); this.hideImage(this.validImage); - this.hideImage(this.invalidImage); } + }, showImage: function(image) { if (image.hasClassName('hidden')) {

1 0

[Suiviobsmer-commits] r652 - trunk
by tchemit＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 15:59:15 +0000 (Sun, 03 Oct 2010) New Revision: 652 Log: Update mavenpom4labs to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:20:28 UTC (rev 651) +++ trunk/pom.xml 2010-10-03 15:59:15 UTC (rev 652) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r651 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service 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/service wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 15:20:28 +0000 (Sun, 03 Oct 2010) New Revision: 651 Log: Use DateUtil instead of DateUtils (deprecated in Nuiton-utils) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.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/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.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-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.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/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-10-03 15:20:28 UTC (rev 651) @@ -25,7 +25,7 @@ package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.ContactState; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,7 +60,7 @@ Date beginDate = getTideBeginDate(); Date endDate = getTideEndDate(); if (beginDate != null && endDate != null) { - int nbDays = DateUtils.getDifferenceInDays(beginDate, endDate); + int nbDays = DateUtil.getDifferenceInDays(beginDate, endDate); // nbDays + 1 to have the first day setTideNbDays(nbDays + 1); } 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-10-03 15:20:28 UTC (rev 651) @@ -28,7 +28,7 @@ import fr.ifremer.wao.service.ServiceSampling; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.time.DurationFormatUtils; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,9 +86,9 @@ //// if (ref.get(Calendar.MONTH) == (curr.getPeriodMonth()-1) && ref.get(Calendar.YEAR) == curr.getPeriodYear()) { //// return curr; //// } -// Date min = DateUtils.setFirstDayOfMonth(curr.getPeriodDate()); -// Date max = DateUtils.setLastDayOfMonth(curr.getPeriodDate()); -// if (DateUtils.between(date, min, max)) { +// Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate()); +// Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate()); +// if (DateUtil.between(date, min, max)) { // return curr; // } // } @@ -98,9 +98,9 @@ return sampleMonthMap.get(dateFormatted); } else { for (SampleMonth curr : getSampleMonth()) { - Date min = DateUtils.setFirstDayOfMonth(curr.getPeriodDate()); - Date max = DateUtils.setLastDayOfMonth(curr.getPeriodDate()); - if (DateUtils.between(date, min, max)) { + Date min = DateUtil.setFirstDayOfMonth(curr.getPeriodDate()); + Date max = DateUtil.setLastDayOfMonth(curr.getPeriodDate()); + if (DateUtil.between(date, min, max)) { return curr; } } 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-10-03 15:20:28 UTC (rev 651) @@ -74,7 +74,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -153,7 +153,7 @@ log.debug("samplRow topiaId : " + row.getTopiaId()); } - String pattern = DateUtils.MONTH_PATTERN; + String pattern = DateUtil.MONTH_PATTERN; DateFormat dateFormat = new SimpleDateFormat(pattern); SampleRow oldRow = null; @@ -1047,7 +1047,7 @@ Integer monthValue = StringUtils.isEmpty(reader.get(i)) ? null : Integer.parseInt(reader.get(i)); - if (monthValue != null && DateUtils.between(monthDate, + if (monthValue != null && DateUtil.between(monthDate, sampleRow.getPeriodBegin(), sampleRow.getPeriodEnd())) { SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-03 15:20:28 UTC (rev 651) @@ -55,7 +55,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -545,7 +545,7 @@ Date rowDataInputDate = (Date)row[1]; Date rowTideBeginDate = (Date)row[2]; - int nbDays = DateUtils.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); + int nbDays = DateUtil.getDifferenceInDays(rowTideBeginDate, rowDataInputDate); if (logger.isDebugEnabled()) { logger.debug("Company : " + rowCompanyName); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-03 15:20:28 UTC (rev 651) @@ -46,7 +46,7 @@ import org.junit.BeforeClass; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -563,7 +563,7 @@ contact1.setObserver(user); contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2010); + Date begin = DateUtil.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); serviceContact.saveContact(contact1, false); @@ -572,7 +572,7 @@ contact2.setObserver(user); contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 10, 2010); + begin = DateUtil.createDate(3, 10, 2010); contact2.setTideBeginDate(begin); serviceContact.saveContact(contact2, false); @@ -581,7 +581,7 @@ contact3.setObserver(user); contact3.setSampleRow(row); contact3.setContactState(ContactState.BOAT_REFUSED); - begin = DateUtils.createDate(3, 5, 2010); + begin = DateUtil.createDate(3, 5, 2010); contact3.setTopiaCreateDate(begin); serviceContact.saveContact(contact3, false); @@ -591,7 +591,7 @@ contact4.setObserver(user2); contact4.setSampleRow(row2); contact4.setContactState(ContactState.BOARDING_EXPECTED); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact4.setTopiaCreateDate(begin); serviceContact.saveContact(contact4, false); @@ -600,7 +600,7 @@ contact5.setObserver(user2); contact5.setSampleRow(row2); contact5.setContactState(ContactState.BOAT_UNAVAILABLE); - begin = DateUtils.createDate(3, 5, 2010); + begin = DateUtil.createDate(3, 5, 2010); contact5.setTopiaCreateDate(begin); serviceContact.saveContact(contact5, false); @@ -610,7 +610,7 @@ contact6.setObserver(user2); contact6.setSampleRow(row2); contact6.setContactState(ContactState.BOAT_UNAVAILABLE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact6.setTopiaCreateDate(begin); contact6.setValidationProgram(Boolean.FALSE); serviceContact.saveContact(contact6, false); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-03 15:20:28 UTC (rev 651) @@ -40,7 +40,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.ArgumentsParserException; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import java.io.BufferedWriter; import java.io.File; @@ -130,8 +130,8 @@ query.addGroup(sampleRow); for (SampleMonth month : curr.getSampleMonth()) { - Date begin = DateUtils.setFirstDayOfMonth(month.getPeriodDate()); - Date end = DateUtils.setLastDayOfMonth(month.getPeriodDate()); + Date begin = DateUtil.setFirstDayOfMonth(month.getPeriodDate()); + Date end = DateUtil.setLastDayOfMonth(month.getPeriodDate()); query.addWhere(tideBegin + " BETWEEN :begin AND :end"). addParam("begin", begin).addParam("end", end); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-10-03 15:20:28 UTC (rev 651) @@ -38,7 +38,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -152,7 +152,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.BOARDING_DONE); - contact1.setTideBeginDate(DateUtils.createDate(3, 3, 2010)); + contact1.setTideBeginDate(DateUtil.createDate(3, 3, 2010)); serviceContact.saveContact(contact1, false); result = boat.canCreateContact(company); @@ -236,21 +236,21 @@ // First contact : OK Contact contact1 = serviceContact.getNewContact(user, row, boat); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 5, 2010); + Date begin = DateUtil.createDate(3, 5, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); /** EXEC METHOD **/ - Date fromDate = DateUtils.createDate(1, 5, 2010); + Date fromDate = DateUtil.createDate(1, 5, 2010); int result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); Contact contact2 = serviceContact.getNewContact(user, row, boat); // Second contact with ValidationProgram = FALSE contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 8, 2010); + begin = DateUtil.createDate(3, 8, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); contact2.setValidationProgram(Boolean.FALSE); @@ -262,7 +262,7 @@ Contact contact3 = serviceContact.getNewContact(user, row, boat); // Third contact with tideBeginDate < fromDate contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -273,7 +273,7 @@ Contact contact4 = serviceContact.getNewContact(user2, row2, boat); // Fourth contact : OK with an other company contact4.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 5, 2010); + begin = DateUtil.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/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-10-03 15:20:28 UTC (rev 651) @@ -118,8 +118,8 @@ // SampleRow row = prepareData(); // // Contact contact = new ContactImpl(); -// Date beginDate = DateUtils.createDate(12, 4, 2009); -// Date endDate = DateUtils.createDate(15, 4, 2009); +// Date beginDate = DateUtil.createDate(12, 4, 2009); +// Date endDate = DateUtil.createDate(15, 4, 2009); // contact.setTideBeginDate(beginDate); // contact.setTideEndDate(endDate); // @@ -131,7 +131,7 @@ //// // Reinit result for next test //// result.addRealTideTime(-1); //// // Test with a more than one day interval dates from contact -//// endDate = DateUtils.createDate(18, 4, 2009); +//// endDate = DateUtil.createDate(18, 4, 2009); //// contact.setTideEndDate(endDate); //// //// getRowFromContext().addRealTideTime(contact); @@ -147,8 +147,8 @@ // SampleRow row = prepareData(); // // Contact contact = new ContactImpl(); -// Date beginDate = DateUtils.createDate(12, 4, 2009); -// Date endDate = DateUtils.createDate(12, 4, 2009); +// Date beginDate = DateUtil.createDate(12, 4, 2009); +// Date endDate = DateUtil.createDate(12, 4, 2009); // contact.setTideBeginDate(beginDate); // contact.setTideEndDate(endDate); // @@ -162,7 +162,7 @@ // result.addRealTideTime(12); // // // Test with a more than one day interval dates from contact : only one tide to remove -// endDate = DateUtils.createDate(18, 4, 2009); +// endDate = DateUtil.createDate(18, 4, 2009); // contact.setTideEndDate(endDate); // // getRowFromContext().removeRealTideTime(contact); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-10-03 15:20:28 UTC (rev 651) @@ -55,7 +55,7 @@ import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,8 +128,8 @@ row.setNbObservants(3); row.setAverageTideTime(2.5); row.setProgramName("DPMA-2009"); - row.setPeriodBegin(DateUtils.createDate(1, 1, 2009)); - row.setPeriodEnd(DateUtils.createDate(31, 3, 2010)); + row.setPeriodBegin(DateUtil.createDate(1, 1, 2009)); + row.setPeriodEnd(DateUtil.createDate(31, 3, 2010)); row.setProfession(profession1); row.setSampleMonth(months); row.setFishingZone(zones); @@ -236,13 +236,13 @@ List<FishingZone> zones = prepareFishingZones(transaction); //Program program1 = programDAO.create(Program.NAME, "DPMA-2009"); - Date dateBegin1 = DateUtils.createDate(1, 1, 2009); - Date dateEnd1 = DateUtils.createDate(1, 3, 2010); + Date dateBegin1 = DateUtil.createDate(1, 1, 2009); + Date dateEnd1 = DateUtil.createDate(1, 3, 2010); PeriodDates period1 = new PeriodDates(dateBegin1, dateEnd1); //Program program2 = programDAO.create(Program.NAME, "PPDA-2008"); - Date dateBegin2 = DateUtils.createDate(1, 1, 2008); - Date dateEnd2 = DateUtils.createDate(1, 12, 2008); + Date dateBegin2 = DateUtil.createDate(1, 1, 2008); + Date dateEnd2 = DateUtil.createDate(1, 12, 2008); PeriodDates period2 = new PeriodDates(dateBegin2, dateEnd2); SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-03 15:20:28 UTC (rev 651) @@ -43,7 +43,7 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.topia.TopiaContext; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -155,7 +155,7 @@ contact1.setObserver(user); contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2010); + Date begin = DateUtil.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -165,7 +165,7 @@ contact2.setObserver(user); contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -175,7 +175,7 @@ contact3.setObserver(user); contact3.setSampleRow(row); contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -246,7 +246,7 @@ // 1 real observer over 1 contact1.setNbObservants(1); contact1.setContactState(ContactState.BOARDING_DONE); - Date begin = DateUtils.createDate(3, 3, 2010); + Date begin = DateUtil.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -258,7 +258,7 @@ // 2 real observer over 1 contact2.setNbObservants(2); contact2.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -270,7 +270,7 @@ // 1 real observer over 2 contact3.setNbObservants(1); contact3.setContactState(ContactState.BOARDING_DONE); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -352,7 +352,7 @@ // contact1.setObserver(user); // contact1.setSampleRow(row); // contact1.setContactState(ContactState.BOARDING_DONE); -// Date begin = DateUtils.createDate(3, 3, 2010); +// Date begin = DateUtil.createDate(3, 3, 2010); // contact1.setTideBeginDate(begin); // serviceContact.saveContact(contact1, false); // @@ -361,7 +361,7 @@ // contact2.setObserver(user); // contact2.setSampleRow(row); // contact2.setContactState(ContactState.BOARDING_DONE); -// begin = DateUtils.createDate(3, 10, 2010); +// begin = DateUtil.createDate(3, 10, 2010); // contact2.setTideBeginDate(begin); // serviceContact.saveContact(contact2, false); // @@ -370,7 +370,7 @@ // contact3.setObserver(user); // contact3.setSampleRow(row); // contact3.setContactState(ContactState.BOAT_REFUSED); -// begin = DateUtils.createDate(3, 5, 2010); +// begin = DateUtil.createDate(3, 5, 2010); // contact3.setTopiaCreateDate(begin); // serviceContact.saveContact(contact3, false); // @@ -380,7 +380,7 @@ // contact4.setObserver(user2); // contact4.setSampleRow(row2); // contact4.setContactState(ContactState.BOARDING_EXPECTED); -// begin = DateUtils.createDate(3, 3, 2010); +// begin = DateUtil.createDate(3, 3, 2010); // contact4.setTopiaCreateDate(begin); // serviceContact.saveContact(contact4, false); // @@ -389,7 +389,7 @@ // contact5.setObserver(user2); // contact5.setSampleRow(row2); // contact5.setContactState(ContactState.BOAT_UNAVAILABLE); -// begin = DateUtils.createDate(3, 5, 2010); +// begin = DateUtil.createDate(3, 5, 2010); // contact5.setTopiaCreateDate(begin); // serviceContact.saveContact(contact5, false); // @@ -399,7 +399,7 @@ // contact6.setObserver(user2); // contact6.setSampleRow(row2); // contact6.setContactState(ContactState.BOAT_UNAVAILABLE); -// begin = DateUtils.createDate(3, 3, 2010); +// begin = DateUtil.createDate(3, 3, 2010); // contact6.setTopiaCreateDate(begin); // contact6.setValidationProgram(Boolean.FALSE); // serviceContact.saveContact(contact6, false); @@ -445,8 +445,8 @@ assertEquals(1, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); // result for period 3/1/2010 to 31/3/2010 for BIS company - Date begin = DateUtils.createDate(3, 1, 2010); - Date end = DateUtils.createDate(31, 3, 2010); + Date begin = DateUtil.createDate(3, 1, 2010); + Date end = DateUtil.createDate(31, 3, 2010); PeriodDates period = new PeriodDates(begin, end); results = service.getContactStateStatistics(company2, period); @@ -513,9 +513,9 @@ contact1.setBoat(boat); contact1.setObserver(user); contact1.setSampleRow(row); - Date begin = DateUtils.createDate(3, 3, 2010); + Date begin = DateUtil.createDate(3, 3, 2010); contact1.setTideBeginDate(begin); - Date inputDate = DateUtils.createDate(15, 4, 2010); + Date inputDate = DateUtil.createDate(15, 4, 2010); contact1.setDataInputDate(inputDate); contact1.setContactState(ContactState.BOARDING_DONE); contact1.setValidationCompany(Boolean.TRUE); @@ -525,9 +525,9 @@ contact2.setBoat(boat); contact2.setObserver(user); contact2.setSampleRow(row); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact2.setTideBeginDate(begin); - inputDate = DateUtils.createDate(15, 3, 2010); + inputDate = DateUtil.createDate(15, 3, 2010); contact2.setDataInputDate(inputDate); contact2.setContactState(ContactState.BOARDING_DONE); contact2.setValidationCompany(Boolean.TRUE); @@ -537,7 +537,7 @@ contact3.setBoat(boat2); contact3.setObserver(user2); contact3.setSampleRow(row2); - begin = DateUtils.createDate(3, 3, 2010); + begin = DateUtil.createDate(3, 3, 2010); contact3.setTideBeginDate(begin); contact3.setDataInputDate(begin); contact3.setContactState(ContactState.BOARDING_DONE); 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-10-03 15:20:28 UTC (rev 651) @@ -27,7 +27,7 @@ import fr.ifremer.wao.WaoUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.services.Response; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import java.util.Date; @@ -69,7 +69,7 @@ @Override public void prepareResponse(Response response) { Date current = WaoUtils.getCurrentDate(); - filename += "-" + DateUtils.formatDate(current, "dd-MM-yyyy") + ".csv"; + filename += "-" + DateUtil.formatDate(current, "dd-MM-yyyy") + ".csv"; response.setHeader("Content-Disposition", "attachment; filename=\"" + filename +"\""); } 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-10-03 15:20:28 UTC (rev 651) @@ -41,7 +41,7 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import java.util.Collections; @@ -138,7 +138,7 @@ } public String getMonthName() { - String libelle = DateUtils.getMonthLibelle(month); + String libelle = DateUtil.getMonthLibelle(month); return StringUtils.capitalize(libelle); } 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-03 15:20:28 UTC (rev 651) @@ -71,7 +71,7 @@ import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.BeanModelSource; import org.apache.tapestry5.upload.services.UploadedFile; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import java.io.IOException; @@ -161,7 +161,7 @@ } contactFilter = new ContactFilterImpl(); // Initialized to 12 months before the current day - Date fromDate = DateUtils.createDateAfterToday(0, -3, 0); + Date fromDate = DateUtil.createDateAfterToday(0, -3, 0); contactFilter.setFromDate(fromDate); } return contactFilter; 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-10-03 15:14:48 UTC (rev 650) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-03 15:20:28 UTC (rev 651) @@ -53,7 +53,7 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; import org.jfree.chart.JFreeChart; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; @@ -292,7 +292,7 @@ } public Date getFromDate() { - return DateUtils.createDateAfterToday(0, -12, 0); + return DateUtil.createDateAfterToday(0, -12, 0); } @Log

1 0

[Suiviobsmer-commits] r650 - in trunk: . src/license src/site src/site/rst src/site/rst/admin src/site/rst/coordinator src/site/rst/guest 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-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer/wao/io/csv wao-business/src/main/java/fr/ifremer/wao/io/kml wao-business
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 15:14:48 +0000 (Sun, 03 Oct 2010) New Revision: 650 Log: Evo #2505 : Change license to AGPL Modified: trunk/LICENSE.txt trunk/changelog.txt trunk/pom.xml trunk/src/license/project.xml 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/seeContacts.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/news.rst trunk/src/site/rst/coordinator/syntheses.rst trunk/src/site/rst/coordinator/users.rst trunk/src/site/rst/guest.rst trunk/src/site/rst/guest/echantillonage.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/seeContacts.rst trunk/src/site/rst/user/syntheses.rst trunk/src/site/site_fr.xml trunk/wao-business/LICENSE.txt trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 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/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.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/ConnectedUserImpl.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/ContactPieChartConstant.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/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.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/NewsImpl.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/ContactInput.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportResultsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.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/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.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/site/rst/index.rst trunk/wao-business/src/site/site_fr.xml trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 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/bean/PieChartDataImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.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/entity/WaoUserImplTest.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/ServiceCartographyImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.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-ui/LICENSE.txt trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.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/Footer.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ImportFieldSet.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/LogFile.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.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/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/ErrorReport.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/FiltersModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/GenericSelectModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.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/TapestryUtil.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.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/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.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/KmlLoader.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.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/Unavailable.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/KmlLoaderStrategy.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.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/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.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/components/LogFile.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/Connexion.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/corelib/components/Errors_fr.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/Cartography.tml trunk/wao-ui/src/main/webapp/Connexion.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/Unavailable.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/cartography.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/js/AdminUserSelect.js trunk/wao-ui/src/main/webapp/js/FCKConf.js trunk/wao-ui/src/main/webapp/js/NewsHider.js trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css trunk/wao-ui/src/main/webapp/js/cartography.js trunk/wao-ui/src/main/webapp/js/contacts.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/AdministrationTest.java 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/ContactsTest.java Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/LICENSE.txt 2010-10-03 15:14:48 UTC (rev 650) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> 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 + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/changelog.txt 2010-10-03 15:14:48 UTC (rev 650) @@ -6,6 +6,11 @@ 1.5.3 ----- +Evolution ++++++++++ + +- [fdesbois] Evo #2505 : Changement de license vers AGPL + Anomalies +++++++++ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/pom.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -238,6 +238,14 @@ <url>http://www.ifremer.fr/</url> </organization> + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> +  <developers> <developer> @@ -282,6 +290,7 @@ <properties> <projectId>suiviobsmer</projectId> + <license.licenseName>agpl_v3</license.licenseName> <labs.id>154</labs.id>  Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/license/project.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -2,7 +2,7 @@ <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> + <mainLicense>agpl_v3</mainLicense> <headers> Modified: trunk/src/site/rst/admin/boats.rst =================================================================== --- trunk/src/site/rst/admin/boats.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/boats.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/admin/contacts.rst =================================================================== --- trunk/src/site/rst/admin/contacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/contacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - @@ -89,4 +88,4 @@ Une fenêtre apparaît alors pour saisir le commentaire. Il ne sera enregistrer qu'après avoir cliquer sur la disquette. -.. image:: contacts_comment_popup.png \ No newline at end of file +.. image:: contacts_comment_popup.png Modified: trunk/src/site/rst/admin/echantillonage.rst =================================================================== --- trunk/src/site/rst/admin/echantillonage.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/echantillonage.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/admin/firstlaunch.rst =================================================================== --- trunk/src/site/rst/admin/firstlaunch.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/firstlaunch.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/admin/news.rst =================================================================== --- trunk/src/site/rst/admin/news.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/news.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/admin/seeContacts.rst =================================================================== --- trunk/src/site/rst/admin/seeContacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/seeContacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Visualiser les contacts Modified: trunk/src/site/rst/admin/syntheses.rst =================================================================== --- trunk/src/site/rst/admin/syntheses.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/syntheses.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/admin/users.rst =================================================================== --- trunk/src/site/rst/admin/users.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/admin/users.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - @@ -100,4 +99,4 @@ cliquant sur le bouton '+'. Pour supprimer un rôle, cliquez sur le bouton '-' en face du rôle concerné. -.. image:: roles.png \ No newline at end of file +.. image:: roles.png Modified: trunk/src/site/rst/business-rules.rst =================================================================== --- trunk/src/site/rst/business-rules.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/business-rules.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/boats.rst =================================================================== --- trunk/src/site/rst/coordinator/boats.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/boats.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/contacts.rst =================================================================== --- trunk/src/site/rst/coordinator/contacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/contacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/news.rst =================================================================== --- trunk/src/site/rst/coordinator/news.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/news.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/syntheses.rst =================================================================== --- trunk/src/site/rst/coordinator/syntheses.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/syntheses.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/coordinator/users.rst =================================================================== --- trunk/src/site/rst/coordinator/users.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator/users.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - @@ -83,4 +82,4 @@ en face du rôle concerné. A noter que le rôle coordinateur comprend tout les droits de l'observateur, il n'est donc pas nécessaire d'attribuer les deux rôles. -.. image:: roles.png \ No newline at end of file +.. image:: roles.png Modified: trunk/src/site/rst/coordinator.rst =================================================================== --- trunk/src/site/rst/coordinator.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/coordinator.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/guest/echantillonage.rst =================================================================== --- trunk/src/site/rst/guest/echantillonage.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/guest/echantillonage.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Le plan d'échantillonage @@ -54,4 +53,4 @@ .. image::autoComplete.png :width: 600px - \ No newline at end of file + Modified: trunk/src/site/rst/guest.rst =================================================================== --- trunk/src/site/rst/guest.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/guest.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Invités @@ -29,4 +28,4 @@ * `Le plan dechantillonage`_ -.. _Le plan dechantillonage:: guest/echantillonage.html \ No newline at end of file +.. _Le plan dechantillonage:: guest/echantillonage.html Modified: trunk/src/site/rst/import/boats.rst =================================================================== --- trunk/src/site/rst/import/boats.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/import/boats.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - @@ -54,4 +53,4 @@ - PER_NOM : Nom de l'armateur - PER_PRENOM : Prénom de l'armateur - NAVS_ACTIVE : Inactivité du navire si besoin (mettre I pour le navire a rendre - inactif) \ No newline at end of file + inactif) Modified: trunk/src/site/rst/import/contacts.rst =================================================================== --- trunk/src/site/rst/import/contacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/import/contacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/import/samplingPlan.rst =================================================================== --- trunk/src/site/rst/import/samplingPlan.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/import/samplingPlan.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/index.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/installation.rst =================================================================== --- trunk/src/site/rst/installation.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/installation.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/model.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -15,18 +15,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/observer.rst =================================================================== --- trunk/src/site/rst/observer.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/observer.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/usecases.rst =================================================================== --- trunk/src/site/rst/usecases.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/usecases.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -15,18 +15,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/account.rst =================================================================== --- trunk/src/site/rst/user/account.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/account.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/authentication.rst =================================================================== --- trunk/src/site/rst/user/authentication.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/authentication.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/boats.rst =================================================================== --- trunk/src/site/rst/user/boats.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/boats.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/contacts.rst =================================================================== --- trunk/src/site/rst/user/contacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/contacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/createAContact.rst =================================================================== --- trunk/src/site/rst/user/createAContact.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/createAContact.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/echantillonage.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/news.rst =================================================================== --- trunk/src/site/rst/user/news.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/news.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user/seeContacts.rst =================================================================== --- trunk/src/site/rst/user/seeContacts.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/seeContacts.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Visualiser les contacts Modified: trunk/src/site/rst/user/syntheses.rst =================================================================== --- trunk/src/site/rst/user/syntheses.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user/syntheses.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/rst/user.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/src/site/site_fr.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-business/LICENSE.txt =================================================================== --- trunk/wao-business/LICENSE.txt 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/LICENSE.txt 2010-10-03 15:14:48 UTC (rev 650) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> 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 + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### ## Default properties for H2 database Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,37 +8,32 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; import fr.ifremer.wao.bean.ContactState; -import fr.ifremer.wao.entity.BoatDistrict; import org.hibernate.SQLQuery; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaId; -import org.nuiton.util.Version; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,25 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; import fr.ifremer.wao.service.ServiceUser; -import java.nio.charset.Charset; -import java.util.Date; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; import org.nuiton.topia.TopiaContext; @@ -34,6 +31,9 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.ApplicationConfig; +import java.nio.charset.Charset; +import java.util.Date; + /** * * @author fdesbois <fdesbois at codelutin.com> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,35 +8,30 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; -import fr.ifremer.wao.entity.ActivityCalendar; -import java.io.IOException; -import java.util.Date; import org.apache.commons.mail.EmailException; -import org.apache.log4j.Level; -import org.apache.log4j.PatternLayout; -import org.apache.log4j.RollingFileAppender; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Date; + /** * Class only used for entities. The entities can't have WaoContext, so * this utils class can use the current {@link WaoContext} in a static way. 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,28 +5,24 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; -import org.apache.commons.lang.StringUtils; import org.nuiton.util.StringUtil; import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; /** * Created: 1 juil. 2010 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,25 +8,23 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; import fr.ifremer.wao.entity.WaoUser; -import org.nuiton.util.StringUtil; import java.util.EnumSet; import java.util.HashSet; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -28,15 +27,15 @@ import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.ContactState; -import java.io.Serializable; -import java.util.Date; import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; +import java.util.Date; + /** * BoatImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,34 +8,34 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; -import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoUtils; +import org.nuiton.i18n.I18n; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaQuery; -import java.io.Serializable; -import org.nuiton.topia.TopiaContext; -import java.util.Date; -import org.nuiton.i18n.I18n; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; +import java.util.Date; + /** * BoatInfosImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,28 +8,28 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; -import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; + /** * CompanyImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,31 +8,29 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; -import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; -import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; -import java.util.Date; import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaQuery.Op; +import java.util.Date; + /** * ContactDAOImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,30 +8,30 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; import fr.ifremer.wao.bean.ContactState; -import java.io.Serializable; -import java.util.Date; import org.nuiton.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; +import java.util.Date; + /** * ContactImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/NewsImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,28 +8,28 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; -import java.io.Serializable; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; + /** * ProfessionImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,35 +8,31 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.WaoDAOHelper; -import fr.ifremer.wao.WaoException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.GregorianCalendar; -import org.nuiton.i18n.I18n; -import org.nuiton.topia.TopiaContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * SampleMonthImpl 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,31 +8,31 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; -import fr.ifremer.wao.WaoBusinessException; -import fr.ifremer.wao.WaoBusinessException.Type; import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.WaoDAOHelper; -import fr.ifremer.wao.WaoProperty; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.service.ServiceSampling; +import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang.time.DurationFormatUtils; +import org.nuiton.util.DateUtils; +import org.nuiton.util.PeriodDates; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -45,17 +45,6 @@ import java.util.List; import java.util.Map; -import fr.ifremer.wao.service.ServiceSampling; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.time.DurationFormatUtils; -import org.apache.commons.mail.EmailException; -import org.nuiton.i18n.I18n; -import org.nuiton.topia.TopiaContext; -import org.nuiton.util.DateUtils; -import org.nuiton.util.PeriodDates; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * SampleRowImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,30 +8,29 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; +import org.apache.commons.lang.StringUtils; +import org.nuiton.util.PeriodDates; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; -import org.nuiton.util.PeriodDates; -import org.nuiton.util.StringUtil; /** * SampleRowLogImpl 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -27,14 +26,13 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.UserRole; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.Serializable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * UserImpl * Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ContactInput.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,25 +5,25 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io; -import fr.ifremer.wao.bean.*; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.Company; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportRefusedException.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportResultsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportResultsImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportResultsImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ExportHelper.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/ImportHelper.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,30 +8,37 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.csv; -import fr.ifremer.wao.*; import com.csvreader.CsvReader; +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.WaoContext; +import fr.ifremer.wao.WaoException; import fr.ifremer.wao.io.csv.WaoCsvHeader.ACTIVITY_CALENDAR; import fr.ifremer.wao.io.csv.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.csv.WaoCsvHeader.DatedHeader; import fr.ifremer.wao.io.csv.WaoCsvHeader.IOHeader; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.time.DurationFormatUtils; +import org.nuiton.util.PeriodDates; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; @@ -42,11 +49,6 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.Locale; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.time.DurationFormatUtils; -import org.nuiton.util.PeriodDates; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * ImportHelper Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/SamplingExport.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -31,12 +30,13 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; import fr.ifremer.wao.io.csv.WaoCsvHeader.SamplingHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.text.ParseException; import java.util.Date; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * SamplingExport Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; @@ -25,18 +24,10 @@ import fr.ifremer.wao.io.BoatDistrictDataImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -//import org.xmlpull.v1.builder.XmlCharacters; -//import org.xmlpull.v1.builder.XmlDocument; -//import org.xmlpull.v1.builder.XmlElement; -//import org.xmlpull.v1.builder.XmlInfosetBuilder; -//import org.xmlpull.v1.builder.xpath.Xb1XPath; -//import org.xmlpull.v1.builder.xpath.jaxen.XPath; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.Iterator; -import java.util.List; /** * Created: 30 juin 2010 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/IconSizeHelper.java 2010-10-03 15:14:48 UTC (rev 650) @@ -1,3 +1,23 @@ +/* + * #%L + * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.bean.PieChartData; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,24 +5,21 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; -import fr.ifremer.wao.io.BoatDistrictData; - import java.io.IOException; import java.io.InputStream; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.io.kml; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,25 +8,26 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; -import fr.ifremer.wao.*; import com.csvreader.CsvReader; +import fr.ifremer.wao.WaoContext; +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.entity.ActivityCalendar; import fr.ifremer.wao.entity.ActivityCalendarDAO; import fr.ifremer.wao.entity.ActivityMonth; @@ -40,6 +41,13 @@ import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.WaoCsvHeader.ACTIVITY_CALENDAR; import fr.ifremer.wao.io.csv.WaoCsvHeader.BOAT; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.time.DurationFormatUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -53,12 +61,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.time.DurationFormatUtils; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * ActivityCalendarImport 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -27,20 +26,50 @@ import com.csvreader.CsvReader; import com.csvreader.CsvWriter; -import fr.ifremer.wao.*; +import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.io.csv.ImportHelper; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.framework.TopiaQuery.Op; +import fr.ifremer.wao.WaoContext; +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.WaoProperty; +import fr.ifremer.wao.WaoQueryBuilder; +import fr.ifremer.wao.WaoQueryHelper; import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.CompanyBoatInfos; import fr.ifremer.wao.bean.CompanyBoatInfosImpl; -import fr.ifremer.wao.entity.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.entity.ActivityCalendar; +import fr.ifremer.wao.entity.ActivityCalendarDAO; +import fr.ifremer.wao.entity.ActivityMonth; +import fr.ifremer.wao.entity.ActivityProfession; +import fr.ifremer.wao.entity.ActivityZone; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.BoatDAO; +import fr.ifremer.wao.entity.BoatDistrict; +import fr.ifremer.wao.entity.BoatDistrictDAO; +import fr.ifremer.wao.entity.BoatInfos; +import fr.ifremer.wao.entity.BoatInfosDAO; +import fr.ifremer.wao.entity.BoatInfosImpl; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactDAO; +import fr.ifremer.wao.entity.ElligibleBoat; +import fr.ifremer.wao.entity.ElligibleBoatDAO; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.ShipOwner; +import fr.ifremer.wao.entity.ShipOwnerDAO; import fr.ifremer.wao.io.csv.ExportHelper; +import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.WaoCsvHeader; import fr.ifremer.wao.io.csv.WaoCsvHeader.BOAT; +import org.apache.commons.lang.StringUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.framework.TopiaQuery.Op; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -54,10 +83,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.TopiaContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * ServiceBoatImpl Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; @@ -25,8 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; - /** * Created: 30 juin 2010 * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -93,6 +92,7 @@ * Created: 3 déc. 2009 * * @author fdesbois <fdesbois at codelutin.com> + * @version $Id$ */ public class ServiceContactImpl extends ServiceContactAbstract { @@ -120,36 +120,6 @@ protected void closeTransaction(TopiaContext transaction) { context.closeTransaction(transaction); } - -// 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); -// } @Override public Map<String, Contact> executeGetContacts(TopiaContext transaction, @@ -172,19 +142,6 @@ addLoad(TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY), TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH)); - -// TopiaQuery query = new WaoQueryBuilder(Contact.class). -// applyContactFilter(filter). -// toQuery(); -// -// // Loading properties -// String observerCompanyProperty = -// TopiaQuery.getProperty(Contact.OBSERVER, WaoUser.COMPANY); -// String sampleMonthProperty = -// TopiaQuery.getProperty(Contact.SAMPLE_ROW, SampleRow.SAMPLE_MONTH); -// -// query.addLoad(observerCompanyProperty, sampleMonthProperty); - Map<String, Contact> results = dao.findAllMappedByQuery(query); return results; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -31,14 +30,13 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.NewsDAO; -import java.util.List; - import fr.ifremer.wao.entity.NewsImpl; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.topia.persistence.TopiaEntity; +import java.util.List; + /** * ServiceNews * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -39,10 +38,6 @@ import fr.ifremer.wao.entity.ProfessionDAO; import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.List; import org.apache.commons.lang.StringUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -51,6 +46,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.List; + /** * ServiceReferentialImpl * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -39,15 +38,13 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; import fr.ifremer.wao.bean.FacadeRowImpl; -import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactDAO; -import fr.ifremer.wao.io.ImportResults; -import fr.ifremer.wao.io.ImportResultsImpl; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; 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.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatDAO; import fr.ifremer.wao.entity.FishingZone; @@ -65,6 +62,8 @@ import fr.ifremer.wao.entity.SampleRowLogDAO; import fr.ifremer.wao.entity.SampleRowLogImpl; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.io.ImportResults; +import fr.ifremer.wao.io.ImportResultsImpl; import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.SamplingExport; import fr.ifremer.wao.io.csv.WaoCsvHeader.FISHING_ZONE; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -30,8 +29,8 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoQueryBuilder; import fr.ifremer.wao.WaoQueryHelper; -import fr.ifremer.wao.WaoQueryHelper.ContactProperty; import fr.ifremer.wao.WaoQueryHelper.BoatDistrictProperty; +import fr.ifremer.wao.WaoQueryHelper.ContactProperty; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.BoardingResultImpl; import fr.ifremer.wao.bean.ContactAverageReactivity; @@ -47,8 +46,6 @@ import fr.ifremer.wao.bean.PieChartSeriesImpl; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.BoatDistrict; -import fr.ifremer.wao.entity.BoatDistrictDAO; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactDAO; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -43,9 +42,6 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserDAO; import fr.ifremer.wao.entity.WaoUserImpl; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.mail.EmailException; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -53,6 +49,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + /** * ServiceUserImpl * Modified: trunk/wao-business/src/site/rst/index.rst =================================================================== --- trunk/wao-business/src/site/rst/index.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/site/rst/index.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Accueil Modified: trunk/wao-business/src/site/site_fr.xml =================================================================== --- trunk/wao-business/src/site/site_fr.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/site/site_fr.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -30,13 +29,6 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowDAO; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.Writer; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; import org.apache.commons.io.IOUtils; import org.junit.After; import org.junit.AfterClass; @@ -49,9 +41,15 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.Writer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + /** * ErrorDB1_0 * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,47 +8,31 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao; import fr.ifremer.wao.service.ServiceBoat; -import fr.ifremer.wao.service.ServiceBoatImpl; import fr.ifremer.wao.service.ServiceCartography; -import fr.ifremer.wao.service.ServiceCartographyImpl; import fr.ifremer.wao.service.ServiceChart; -import fr.ifremer.wao.service.ServiceChartEmpty; import fr.ifremer.wao.service.ServiceContact; -import fr.ifremer.wao.service.ServiceContactImpl; import fr.ifremer.wao.service.ServiceNews; -import fr.ifremer.wao.service.ServiceNewsImpl; import fr.ifremer.wao.service.ServiceReferential; -import fr.ifremer.wao.service.ServiceReferentialImpl; import fr.ifremer.wao.service.ServiceSampling; -import fr.ifremer.wao.service.ServiceSamplingImpl; import fr.ifremer.wao.service.ServiceSynthesis; -import fr.ifremer.wao.service.ServiceSynthesisImpl; import fr.ifremer.wao.service.ServiceUser; -import fr.ifremer.wao.service.ServiceUserImpl; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Properties; import org.junit.Ignore; import org.nuiton.topia.TopiaException; import org.nuiton.util.ApplicationConfig; @@ -56,6 +40,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.Properties; + /** * WaoRunnerTest * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -34,8 +33,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; + /** * WaoUtilsTest * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/UserRoleTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.bean; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,33 +8,29 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; +import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; -import fr.ifremer.wao.TestManager; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; -import java.io.InputStream; -import java.util.Date; -import java.util.List; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -46,6 +42,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.InputStream; +import java.util.Date; +import java.util.List; + /** * BoatImplTest * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,28 +8,24 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; -import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.TestManager; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; +import fr.ifremer.wao.WaoDAOHelper; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -37,11 +33,14 @@ import org.junit.Test; 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.junit.Assert.*; +import java.util.Calendar; +import java.util.GregorianCalendar; + +import static org.junit.Assert.assertFalse; + /** * SampleRowImplTest * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.entity; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,32 +8,25 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; +import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoProperty; -import fr.ifremer.wao.TestManager; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.util.zip.GZIPInputStream; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -42,8 +35,14 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.GZIPInputStream; + /** * ActivityCalendarImport * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,35 +8,59 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; +import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoProperty; +import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.BoatFilterImpl; -import fr.ifremer.wao.TestManager; -import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.CompanyBoatInfos; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.UserRole; -import fr.ifremer.wao.entity.*; +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 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.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -45,11 +69,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import org.junit.*; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.service; @@ -30,24 +29,16 @@ import fr.ifremer.wao.entity.BoatDistrictDAO; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.io.ImportResults; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.util.FileUtil; -import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.HashSet; import java.util.List; import java.util.Set; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -30,8 +29,6 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactImpl; import fr.ifremer.wao.entity.WaoUser; -import java.util.Map; -import org.apache.commons.collections.CollectionUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -39,6 +36,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Map; + /** * ServiceContactImplTest * Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -30,8 +29,6 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.FishingZone; -import java.io.InputStream; -import java.util.List; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -39,8 +36,13 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.*; +import java.io.InputStream; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * * @author fdesbois <fdesbois at codelutin.com> 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -31,9 +30,6 @@ import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserImpl; -import fr.ifremer.wao.entity.WaoUserImplTest; -import java.util.List; - import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -43,6 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + /** * * @author fdesbois <fdesbois at codelutin.com> Modified: trunk/wao-ui/LICENSE.txt =================================================================== --- trunk/wao-ui/LICENSE.txt 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/LICENSE.txt 2010-10-03 15:14:48 UTC (rev 650) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> 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 + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,28 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; @@ -41,6 +35,11 @@ import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; + /** * * @author fdesbois <fdesbois at codelutin.com> 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,26 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; -import java.util.ArrayList; -import java.util.List; - import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.MarkupWriter; @@ -35,6 +31,9 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; +import java.util.ArrayList; +import java.util.List; + /** * Composant qui affiche des messages à l'utilisateur. * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ImportFieldSet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ImportFieldSet.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ImportFieldSet.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,24 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; -import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.ui.pages.Index; import fr.ifremer.wao.ui.services.ServiceAuthentication; @@ -40,8 +38,6 @@ import org.apache.tapestry5.services.Request; import org.slf4j.Logger; -import java.util.Calendar; - /** * Layout * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/LogFile.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; @@ -28,7 +27,6 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.services.Response; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/MinimalWindow.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.components; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,27 +8,23 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.WaoException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.grid.ColumnSort; import org.apache.tapestry5.grid.GridDataSource; @@ -38,6 +34,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * ContactDataSource * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -29,13 +28,14 @@ import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.service.ServiceBoat; -import java.util.Map; import org.apache.tapestry5.beaneditor.PropertyModel; import org.apache.tapestry5.grid.ColumnSort; import org.apache.tapestry5.grid.SortConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Map; + /** * BoatDataSource * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,27 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; import org.jfree.chart.axis.CategoryLabelPositions; @@ -44,6 +39,11 @@ import org.jfree.data.category.DefaultCategoryDataset; import org.jfree.ui.RectangleInsets; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Map; + /** * ChartUtils * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -29,11 +28,12 @@ import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.service.ServiceContact; -import java.util.Map; import org.apache.tapestry5.grid.SortConstraint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Map; + /** * ContactDataSource * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ErrorReport.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,29 +8,29 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.WaoUtils; -import java.util.Date; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.services.Response; import org.nuiton.util.DateUtils; +import java.util.Date; + /** * Used to render CSV file from data export. * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/FiltersModel.java 2010-10-03 15:14:48 UTC (rev 650) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.WaoException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/GenericSelectModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/GenericSelectModel.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/GenericSelectModel.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,26 +8,21 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; -import java.util.ArrayList; -import java.util.List; - -import java.util.Map; import org.apache.tapestry5.OptionGroupModel; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.internal.OptionGroupModelImpl; @@ -38,6 +33,10 @@ import org.apache.tapestry5.util.AbstractSelectModel; import org.slf4j.Logger; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * GenericSelectModel.java * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ImportEngine.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,32 +5,28 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.ui.pages.KmlLoader; import fr.ifremer.wao.ui.services.KmlLoaderStrategy; -import org.apache.commons.io.FileUtils; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.services.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,24 +5,24 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.bean.UserRole; + import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/TapestryUtil.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,30 +8,30 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.data; +import org.nuiton.topia.persistence.TopiaEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.HashMap; import java.util.Map; -import org.nuiton.topia.persistence.TopiaEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * BoatInfosPropertyChangeListener 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -30,29 +29,23 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.io.ImportResults; -import fr.ifremer.wao.io.ImportResultsImpl; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.io.ImportResults; +import fr.ifremer.wao.io.ImportResultsImpl; import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ErrorReport; import fr.ifremer.wao.ui.data.GenericSelectModel; -import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.ImportEngine; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; - -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.EventContext; import org.apache.tapestry5.OptionModel; @@ -78,6 +71,11 @@ import org.apache.tapestry5.services.BeanModelSource; import org.slf4j.Logger; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + /** * Administration * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,24 +8,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.BoatFilterImpl; @@ -62,20 +60,15 @@ import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.InjectPage; -import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.PageRenderLinkSource; -import org.apache.tapestry5.services.Response; -import org.apache.tapestry5.upload.services.UploadedFile; import org.slf4j.Logger; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.text.DateFormat; @@ -84,7 +77,6 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; -import java.util.zip.GZIPInputStream; /** * Boats Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.pages; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -27,9 +26,7 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.News; -import fr.ifremer.wao.entity.NewsImpl; import fr.ifremer.wao.service.ServiceNews; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.tapestry5.Asset2; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,30 +5,28 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; -import fr.ifremer.wao.ui.services.KmlLoaderStrategy; -import fr.ifremer.wao.ui.services.KmlLoaderStrategyContacts; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.data.TapestryUtil; +import fr.ifremer.wao.ui.services.KmlLoaderStrategy; +import fr.ifremer.wao.ui.services.KmlLoaderStrategyContacts; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.pages; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -29,7 +28,6 @@ import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.FacadeRow; -import fr.ifremer.wao.io.ImportResults; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.FishingZone; @@ -45,7 +43,6 @@ import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.IncludeStylesheet; import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -53,7 +50,6 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.upload.services.UploadedFile; import org.nuiton.util.PeriodDates; import org.nuiton.util.StringUtil; import org.nuiton.util.StringUtil.ToString; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -27,8 +26,6 @@ import fr.ifremer.wao.WaoContextImpl; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ContactFilter; -import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.PieChartData; import fr.ifremer.wao.bean.PieChartDataImpl; import fr.ifremer.wao.service.ServiceBoat; 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -28,7 +27,6 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.WaoUser; -import java.lang.annotation.Annotation; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.PropertyConduit; import org.apache.tapestry5.beaneditor.BeanModel; @@ -36,6 +34,8 @@ import org.apache.tapestry5.services.BeanModelSource; import org.nuiton.topia.persistence.TopiaEntity; +import java.lang.annotation.Annotation; + /** * ContactModelFactory * Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,25 +5,22 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.services; -import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.WaoFilter; -import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.ui.pages.KmlLoader; import org.apache.tapestry5.StreamResponse; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,29 +5,26 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.bean.ContactFilter; -import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceCartography; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.KmlStreamResponse; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.SessionState; import java.io.IOException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.services; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthenticationImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.services; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package fr.ifremer.wao.ui.services; @@ -30,7 +29,6 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -37,21 +36,18 @@ import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceUser; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.services.RegistryShutdownListener; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; import org.nuiton.util.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + /** * WaoManager * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/BooleanImage.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -35,8 +34,8 @@ <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 href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="blank"> + AGPLv3 </a> - Copyright 2009-${currentYear} <a href="http://www.ifremer.fr" title="Ifremer" target="blank"> Ifremer</a>, @@ -55,4 +54,4 @@ </div> -</html> \ No newline at end of file +</html> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -35,4 +34,4 @@ </form> </div> -</html> \ No newline at end of file +</html> 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### login-label: Identifiant 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### fishingZoneCsvFile-label: Fichier CSV des zones de p\u00eache 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### districtCode-label: Code Quartier 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### boatsCsvFile-label: Fichier CSV des navires Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Connexion.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -5,20 +5,19 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### login-label: Identifiant (email) password-label: Mot de passe -userRole-label: R\u00f4le \ No newline at end of file +userRole-label: R\u00f4le 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### # ContactForm labels 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### # ContactForm labels 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### title-label: Titre 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### # FOR PROFESSION PART 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### samplingPlanCsvFile-label: Fichier CSV du plan d'\u00e9chantillonnage 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### periodBegin-label: D\u00e9but 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### firstName-label: Pr\u00e9nom Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/log4j.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### # Default to info level output; this is very handy if you eventually use Hibernate as well. Modified: trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -default-banner: Vous devez corriger les erreurs suivantes pour pouvoir continuer : \ No newline at end of file +default-banner: Vous devez corriger les erreurs suivantes pour pouvoir continuer : 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### required=Le champs %s est requis. Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml =================================================================== --- trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Cartography.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Cartography.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Cartography.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Connexion.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Connexion.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Connexion.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/ExceptionReport.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ExceptionReport.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/ExceptionReport.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Index.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Index.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Index.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/SampleRowHistoric.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/Unavailable.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Unavailable.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/Unavailable.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,21 +12,20 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:layout t:pageTitle="Accès réservé" t:contentId="so-unavailable" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter" /> \ No newline at end of file + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter" /> Modified: trunk/wao-ui/src/main/webapp/UserProfile.tml =================================================================== --- trunk/wao-ui/src/main/webapp/UserProfile.tml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/UserProfile.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -12,18 +12,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ # 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. +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### # This is where global application properties go. Modified: trunk/wao-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/css/administration.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/administration.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/administration.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/boats.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/boats.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/boats.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* @@ -81,4 +80,4 @@ #so-footer a:hover { color: white !important; -} \ No newline at end of file +} Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/main.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/sampling.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/sampling.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/sampling.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/css/userProfile.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* Modified: trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/AdminUserSelect.js 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /** @@ -51,4 +50,4 @@ //Tapestry.debug('select value : ' + $F(this.userSelect)); this.hiddenUserId.setValue($F(this.userSelect)); } -}); \ No newline at end of file +}); Modified: trunk/wao-ui/src/main/webapp/js/FCKConf.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ FCKConfig.ToolbarCanCollapse = false; Modified: trunk/wao-ui/src/main/webapp/js/NewsHider.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/NewsHider.js 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /** @@ -98,4 +97,4 @@ toggleDetails: function(event) { this.hiddenBlock.toggleClassName('hidden'); } -}); \ No newline at end of file +}); Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /* @@ -2408,4 +2407,4 @@ this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this);},read:function(options){options=OpenLayers.Util.extend({},options);OpenLayers.Util.applyDefaults(options,this.options||{});var response=new OpenLayers.Protocol.Response({requestType:"read"});var format=this.format;var data=OpenLayers.Format.XML.prototype.write.apply(format,[format.writeNode("sos:GetFeatureOfInterest",{fois:this.fois})]);response.priv=OpenLayers.Request.POST({url:options.url,callback:this.createCallback(this.handleRead,response,options),data:data});return response;},handleRead:function(response,options){if(options.callback){var request=response.priv;if(request.status>=200&&request.status<300){response.features=this.parseFeatures(request);response.code=OpenLayers.Protocol.Response.SUCCESS;}else{response.code=OpenLayers.Protocol.Response.FAILURE;} options.callback.call(options.scope,response);}},parseFeatures:function(request){var doc=request.responseXML;if(!doc||!doc.documentElement){doc=request.responseText;} if(!doc||doc.length<=0){return null;} -return this.format.read(doc);},CLASS_NAME:"OpenLayers.Protocol.SOS.v1_0_0"});OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",initialize:function(options){OpenLayers.Format.SLD.v1.prototype.initialize.apply(this,[options]);},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"}); \ No newline at end of file +return this.format.read(doc);},CLASS_NAME:"OpenLayers.Protocol.SOS.v1_0_0"});OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",initialize:function(options){OpenLayers.Format.SLD.v1.prototype.initialize.apply(this,[options]);},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"}); Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css 2010-10-03 15:14:48 UTC (rev 650) @@ -5,17 +5,16 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ .olLayerGoogleCopyright { Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ .olControlZoomPanel div { Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ div.olMap { Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ var lon = 5; @@ -106,4 +105,4 @@ feature.popup.destroy(); delete feature.popup; } -} \ No newline at end of file +} Modified: trunk/wao-ui/src/main/webapp/js/contacts.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/contacts.js 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ /** @@ -117,4 +116,4 @@ this.contactForm.hiddenSendEmail.setValue(true); } } -}); \ No newline at end of file +}); Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ //function openCommentWindow(window, commentPopupId, commentHiddenClass) { Modified: trunk/wao-ui/src/site/rst/index.rst =================================================================== --- trunk/wao-ui/src/site/rst/index.rst 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/site/rst/index.rst 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ .. * 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. +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. .. * -.. * You should have received a copy of the GNU General Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - Accueil Modified: trunk/wao-ui/src/site/site_fr.xml =================================================================== --- trunk/wao-ui/src/site/site_fr.xml 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/site/site_fr.xml 2010-10-03 15:14:48 UTC (rev 650) @@ -9,18 +9,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ package test.fr.ifremer.wao.ui; @@ -27,23 +26,19 @@ import com.formos.tapestry.testify.core.TapestryTester; import com.formos.tapestry.testify.junit4.TapestryTest; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ConnectedUserImpl; 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 org.mockito.MockitoAnnotations; +import test.fr.ifremer.wao.ui.demo.DemoModule; -import java.util.ArrayList; -import java.util.List; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -import static org.mockito.Mockito.*; - /** * AbstractApplicationTest * 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.tml 2010-10-03 15:14:48 UTC (rev 650) @@ -11,18 +11,17 @@ 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. + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> <t:layout t:pageTitle="TEST LAYOUT" t:contentId="so-test" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" /> Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/AdministrationTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ 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-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -8,18 +8,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -36,23 +35,26 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceNews; import fr.ifremer.wao.service.ServiceUser; -import java.util.ArrayList; - import fr.ifremer.wao.ui.services.ServiceAuthentication; -import test.fr.ifremer.wao.ui.AbstractApplicationTest; -import java.util.HashMap; -import java.util.List; -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.junit.Assert; +import org.junit.Test; import org.mockito.Mock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.mockito.Mockito.*; +import test.fr.ifremer.wao.ui.AbstractApplicationTest; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * * @author fdesbois <fdesbois at codelutin.com> Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java 2010-10-03 14:39:45 UTC (rev 649) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ContactsTest.java 2010-10-03 15:14:48 UTC (rev 650) @@ -5,18 +5,17 @@ * 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. + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ @@ -27,8 +26,6 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceContact; -import java.util.HashMap; -import java.util.Map; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; @@ -36,6 +33,9 @@ import org.slf4j.LoggerFactory; import test.fr.ifremer.wao.ui.AbstractApplicationTest; +import java.util.HashMap; +import java.util.Map; + /** * ContactsTest *

1 0

[Suiviobsmer-commits] r649 - trunk/wao-business/src/test/java/fr/ifremer/wao/io
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 14:39:45 +0000 (Sun, 03 Oct 2010) New Revision: 649 Log: Use DateUtil from Nuiton-utils Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 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-10-03 14:27:26 UTC (rev 648) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-10-03 14:39:45 UTC (rev 649) @@ -25,30 +25,32 @@ package fr.ifremer.wao.io; -import fr.ifremer.wao.*; import com.csvreader.CsvReader; +import fr.ifremer.wao.TestManager; import fr.ifremer.wao.io.csv.ImportHelper; import fr.ifremer.wao.io.csv.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.csv.WaoCsvHeader.DatedHeader; import fr.ifremer.wao.io.csv.WaoCsvHeader.SAMPLING; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.Locale; 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.nuiton.util.DateUtils; -import static org.junit.Assert.*; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.Locale; + +import static org.junit.Assert.assertEquals; + /** * * @author fdesbois <fdesbois at codelutin.com> @@ -92,38 +94,6 @@ } /** - * Test of getHeaderForContactCsv method, of class ImportHelper. - */ - //@Test - public void testGetHeaderForContactCsv() { - System.out.println("getHeaderForContactCsv"); - } - - /** - * Test of formatContactValidation method, of class ImportHelper. - */ - //@Test - public void testFormatContactValidation() { - System.out.println("formatContactValidation"); - } - - /** - * Test of formatContactMammals method, of class ImportHelper. - */ - //@Test - public void testFormatContactMammals() { - System.out.println("formatContactMammals"); - } - - /** - * Test of parseContactMammals method, of class ImportHelper. - */ - //@Test - public void testParseContactMammals() { - System.out.println("parseContactMammals"); - } - - /** * Test of formatContactCode method, of class ImportHelper. */ @Test @@ -143,6 +113,7 @@ /** * Test of parseContactCreateDate method, of class ImportHelper. + * @throws Exception all exceptions are thrown */ @Test public void testParseContactCreateDate() throws Exception { @@ -156,29 +127,14 @@ calendar.set(Calendar.SECOND, 50); calendar.set(Calendar.MILLISECOND, 718); Date expResult = calendar.getTime(); - Date date = DateUtils.createDate(23,10,2009); + Date date = DateUtil.createDate(23,10,2009); Date result = ImportHelper.parseContactCreateDate(code, date); assertEquals(expResult, result); } /** - * Test of logTimeAndMemory method, of class ImportHelper. - */ - //@Test - public void testLogTimeAndMemory() { - System.out.println("logTimeAndMemory"); - } - - /** - * Test of parseContactValidation method, of class ImportHelper. - */ - //@Test - public void testParseContactValidation() throws Exception { - System.out.println("parseContactValidation"); - } - - /** * Test of readSampleRowCode method, of class ImportHelper. + * @throws Exception all exceptions are thrown */ @Test public void testReadSampleRowCode() throws Exception { @@ -202,15 +158,8 @@ } /** - * Test of getContactDateFormat method, of class ImportHelper. - */ - //@Test - public void testGetContactDateFormat() { - System.out.println("getContactDateFormat"); - } - - /** * Test of read method, of class ImportHelper. + * @throws Exception all exceptions are thrown */ @Test public void testRead() throws Exception { @@ -222,31 +171,8 @@ } /** - * Test of readInt method, of class ImportHelper. - */ - //@Test - public void testReadInt() throws Exception { - System.out.println("readInt"); - } - - /** - * Test of readInteger method, of class ImportHelper. - */ - //@Test - public void testReadInteger() throws Exception { - System.out.println("readInteger"); - } - - /** - * Test of readPeriod method, of class ImportHelper. - */ - //@Test - public void testReadPeriod() throws Exception { - System.out.println("readPeriod"); - } - - /** * Test of readDate method, of class ImportHelper. + * @throws Exception all exceptions are thrown */ @Test public void testReadDate() throws Exception { @@ -275,7 +201,7 @@ }; Date res = ImportHelper.readDate(reader, header1); - Date ref = DateUtils.createDate(10, 2, 2010); + Date ref = DateUtil.createDate(10, 2, 2010); Assert.assertEquals(ref, res); // TEST2 : Date like JJ/MM/AA @@ -312,7 +238,7 @@ }; res = ImportHelper.readDate(reader, header3); - Date ref2 = DateUtils.createDate(1, 2, 2010); + Date ref2 = DateUtil.createDate(1, 2, 2010); Assert.assertEquals(ref2, res); // TEST4: date like JJ/MM/AA

1 0

[Suiviobsmer-commits] r648 - in trunk/wao-business/src: main/java/fr/ifremer/wao/io/csv main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 14:27:26 +0000 (Sun, 03 Oct 2010) New Revision: 648 Log: Ano #2500 : error import contact CSV : - CONT_COMMENT field not imported Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-10-03 14:27:26 UTC (rev 648) @@ -25,11 +25,12 @@ package fr.ifremer.wao.io.csv; +import org.apache.commons.lang.BooleanUtils; + import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.Locale; -import org.apache.commons.lang.BooleanUtils; /** * CsvHeader @@ -332,6 +333,10 @@ CONT_SOCIETE_VALID(31), /** Contact program validation **/ CONT_PROGRAM_VALID(32); +// /** Contact company comment **/ +// CONT_COMMENT_SOCIETE(33), +// /** Contact program comment **/ +// CONT_COMMENT_PROGRAM(34); private int contactHeader; 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-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 14:27:26 UTC (rev 648) @@ -704,6 +704,10 @@ contact.setDataInputDate( ImportHelper.readDate(reader, CONTACT.CONT_ALLEGRO)); + contact.setComment( + ImportHelper.read(reader, CONTACT.CONT_COMMENT) + ); + if (updateValidation) { if (log.isDebugEnabled()) { log.debug("SuperAdmin import :: validations"); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 14:15:34 UTC (rev 647) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-03 14:27:26 UTC (rev 648) @@ -57,7 +57,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; -import org.nuiton.util.DateUtils; +import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,14 +163,14 @@ SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); logger.info("SampleMonth : 03/2010 _ row 2010_0001"); - Date monthDate = DateUtils.createDate(1, 3, 2010); + Date monthDate = DateUtil.createDate(1, 3, 2010); sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); - monthDate = DateUtils.createDate(1, 4, 2010); + monthDate = DateUtil.createDate(1, 4, 2010); monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); - Date contactDate = DateUtils.createDate(18, 3, 2010); + Date contactDate = DateUtil.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); when(contact.getSampleRow()).thenReturn(sampleRow); @@ -220,7 +220,7 @@ // SampleMonthDAO monthDAO = // WaoDAOHelper.getSampleMonthDAO(transaction); // -// Date contactDate = DateUtils.createDate(18, 10, 2010); +// Date contactDate = DateUtil.createDate(18, 10, 2010); // when(contact.getTideBeginDate()).thenReturn(contactDate); // // service.getExistingSampleMonthForContact(monthDAO, @@ -406,7 +406,7 @@ when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); when(contact.getTideBeginDate()). - thenReturn(DateUtils.createDate(3, 4, 2010)); + thenReturn(DateUtil.createDate(3, 4, 2010)); service.updateSampleMonthTidesValue(transaction, contactReference, contact, true); @@ -426,7 +426,7 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); TopiaQuery query = dao.createQuery(); - query.addEquals(SampleMonth.PERIOD_DATE, DateUtils.createDate(1, 4, 2010)); + query.addEquals(SampleMonth.PERIOD_DATE, DateUtil.createDate(1, 4, 2010)); SampleMonth month = dao.findByQuery(query); @@ -538,7 +538,6 @@ WaoBusinessException, IOException, ImportRefusedException, - ImportRefusedException, ParseException { logger.info("testLoadContactCsv"); @@ -573,6 +572,9 @@ thenReturn("18/03/10"); when(reader.get(CONTACT.CONT_CODE.name())). thenReturn(""); + String comment = "Commentaire sur le contact\nAutre ligne"; + when(reader.get(CONTACT.CONT_COMMENT.name())). + thenReturn(comment); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(false); @@ -586,20 +588,21 @@ try { result.initialize(transaction, creator, 1); service.loadContactCsv(reader, result, false); - Date createDate = DateUtils.createDate(18,3,2010); + Date createDate = DateUtil.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), + assertEquals(DateUtil.createDate(22,3,2010), result.getTideBeginDate()); - assertEquals(DateUtils.createDate(22,3,2010), + assertEquals(DateUtil.createDate(22,3,2010), result.getTideEndDate()); assertEquals(1, result.getNbObservants()); assertFalse(result.getMammalsCapture()); - assertTrue(result.getMammalsObservation()); - assertEquals(DateUtils.createDate(25,3,2010), + assertTrue(result.getMammalsObservation()); + assertEquals(comment, result.getComment()); + assertEquals(DateUtil.createDate(25,3,2010), result.getDataInputDate()); // No validation update : creator is not an admin assertNull(result.getValidationCompany()); @@ -669,7 +672,7 @@ // Don't use a mock in this case Contact newContact = service.getNewContact(observer, sampleRow, boat); - newContact.setTopiaCreateDate(DateUtils.createDate(2, 3, 2010)); + newContact.setTopiaCreateDate(DateUtil.createDate(2, 3, 2010)); /** EXEC METHOD **/ @@ -713,8 +716,8 @@ 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); + Date tideBeginDate = DateUtil.createDate(18,3,2010); + Date tideEndDate = DateUtil.createDate(19,3,2010); try { transaction = manager.getContext().beginTransaction();

1 0

[Suiviobsmer-commits] r647 - in trunk: . wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 03 Oct '10

03 Oct '10

Author: fdesbois Date: 2010-10-03 14:15:34 +0000 (Sun, 03 Oct 2010) New Revision: 647 Log: - Migrate nuiton libraries (EUGene, Nuiton-utils and ToPIA) - Fix some javadoc Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/changelog.txt 2010-10-03 14:15:34 UTC (rev 647) @@ -3,6 +3,20 @@ Historique des versions +1.5.3 +----- + +Anomalies ++++++++++ + +Mise à jour librairies +++++++++++++++++++++++ + +- **Nuiton-utils** 1.3.1 -> 1.4.2 [http://maven-site.nuiton.org/nuiton-utils] +- **ToPIA** 2.4.2 -> 2.4.3 [http://maven-site.nuiton.org/topia/topia-persistence] +- **EUGene** 2.1.1 -> 2.2 [http://maven-site.nuiton.org/eugene] +- **mavenpom4labs** 2.2.3 -> 2.2.6 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + 1.5.2 ----- @@ -12,6 +26,11 @@ - [fdesbois] Ano #2374 : L'expéditeur lors de l'envoi du mail automatique d'un contact avec embarquement programmé/réalisé n'est pas bon. +Mise à jour librairies +++++++++++++++++++++++ + +- **mavenpom4labs** 2.2.2.1 -> 2.2.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + 1.5.1 ----- @@ -21,7 +40,6 @@ - [fdesbois] Evo #2370 : Cartographie contacts : modifier taille du camembert en fonction du nombre de contacts. - [fdesbois] Evo #2369 : Ajout filtres sur carte des contacts. -- [fdesbois] Evo #2361 : Mail automatique suite à un embarquement programmé. Anomalies +++++++++ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/pom.xml 2010-10-03 14:15:34 UTC (rev 647) @@ -286,10 +286,10 @@  <i18n.version>1.2.2</i18n.version> - <nuitonutils.version>1.3.1</nuitonutils.version> + <nuitonutils.version>1.4.2</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4.2</topia.version> - <eugene.version>2.1.1</eugene.version> + <topia.version>2.4.3</topia.version> + <eugene.version>2.2</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-09-29 08:13:10 UTC (rev 646) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-10-03 14:15:34 UTC (rev 647) @@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory; import java.nio.charset.Charset; -import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.Locale; @@ -343,10 +342,13 @@ } @Override - public void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws WaoException { + public void treateError(TopiaContext transaction, + Exception eee, + String message, + Object... args) throws WaoException { + if (log.isDebugEnabled()) { - log.debug(_(message, args),eee); + log.debug(_(message, args), eee); } if (!(eee instanceof WaoException)) { //if (!(eee instanceof TopiaException)) { @@ -395,12 +397,12 @@ @Override public String encodeString(String string) { - try { +// try { return StringUtil.encodeMD5(string); - } catch (NoSuchAlgorithmException eee) { - treateError(eee, n_("wao.error.context.encodeString")); - } - return null; +// } catch (NoSuchAlgorithmException eee) { +// treateError(eee, n_("wao.error.context.encodeString")); +// } +// return null; } @Override 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-09-29 08:13:10 UTC (rev 646) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-10-03 14:15:34 UTC (rev 647) @@ -293,16 +293,24 @@ * @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 + * @throws TopiaException for any Topia technical trouble + * @throws NullSampleMonthException if sampleMonth not found to update tides + * value * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) */ - protected void createOrUpdateContact(ContactDAO dao, Contact source, - Contact destination, boolean calculateReal) - throws TopiaException, NullSampleMonthException { + protected void createOrUpdateContact(ContactDAO dao, + Contact source, + Contact destination, + boolean calculateReal) + throws TopiaException, + NullSampleMonthException { - updateSampleMonthTidesValue(dao.getContext(), destination, - source, calculateReal); + updateSampleMonthTidesValue( + dao.getContext(), + destination, + source, + calculateReal + ); // Create the contact if not defined if (destination == null) { @@ -310,12 +318,13 @@ 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()); + TopiaEntity.TOPIA_CREATE_DATE, source.getTopiaCreateDate() + ); if (log.isDebugEnabled()) { log.debug("TopiaId of the new contact : " + @@ -527,9 +536,12 @@ @Override public ImportResults executeImportContactCsv(TopiaContext transaction, - ConnectedUser user, InputStream input) - throws TopiaException, IOException, - WaoBusinessException, ParseException { + ConnectedUser user, + InputStream input) + throws TopiaException, + IOException, + WaoBusinessException, + ParseException { ImportResults result = new ImportResultsImpl(); int currRow = 1; @@ -742,7 +754,7 @@ * @param oldContact old state of the contact * @param contact changed can be null for delete case * @param calculateReal to calculate real tides value - * @throws TopiaException + * @throws TopiaException for any Topia technical trouble * @throws NullSampleMonthException if SampleMonth can't be found */ protected void updateSampleMonthTidesValue( @@ -856,7 +868,7 @@ * * @param transaction used to update the ElligibleBoat * @param contact which contains sampleRow and boat to link - * @throws TopiaException + * @throws TopiaException for any Topia technical trouble */ protected void updateElligibleBoatForContact(TopiaContext transaction, Contact contact) throws TopiaException {

1 0

[Suiviobsmer-commits] r646 - trunk
by tchemit＠users.labs.libre-entreprise.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 08:13:10 +0000 (Wed, 29 Sep 2010) New Revision: 646 Log: Utilisation de mavenpom4labs 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:33:00 UTC (rev 645) +++ trunk/pom.xml 2010-09-29 08:13:10 UTC (rev 646) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r645 - trunk
by tchemit＠users.labs.libre-entreprise.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 09:33:00 +0000 (Thu, 09 Sep 2010) New Revision: 645 Log: Utilisation de mavenpom4labs 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:21:27 UTC (rev 644) +++ trunk/pom.xml 2010-09-09 09:33:00 UTC (rev 645) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r644 - trunk
by tchemit＠users.labs.libre-entreprise.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 14:21:27 +0000 (Sun, 29 Aug 2010) New Revision: 644 Log: Utilisation de mavenpom4labs 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-23 18:05:14 UTC (rev 643) +++ trunk/pom.xml 2010-08-29 14:21:27 UTC (rev 644) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <groupId>fr.ifremer</groupId>

1 0

Jump to page: