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

[Suiviobsmer-commits] r1194 - trunk/wao-business/src/license
by bleny＠users.labs.libre-entreprise.org April 13, 2011

April 13, 2011

Author: bleny Date: 2011-04-13 12:24:24 +0000 (Wed, 13 Apr 2011) New Revision: 1194 Log: add licence for iCal4j Modified: trunk/wao-business/src/license/THIRD-PARTY.properties Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2011-04-13 11:42:32 UTC (rev 1193) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2011-04-13 12:24:24 UTC (rev 1194) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License @@ -22,9 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 21 12:11:54 CET 2011 +#Wed Apr 13 14:31:37 CEST 2011 antlr--antlr--2.7.6--jar=BSD commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD +ical4j--ical4j--0.9.20--jar=iCal4j License http://m2.modularity.net.au/projects/ical4j/license.html javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

[Suiviobsmer-commits] r1193 - in trunk: . wao-business
by sletellier＠users.labs.libre-entreprise.org April 13, 2011

April 13, 2011

Author: sletellier Date: 2011-04-13 11:42:32 +0000 (Wed, 13 Apr 2011) New Revision: 1193 Log: Fix ical dependency Modified: trunk/pom.xml trunk/wao-business/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-13 11:29:05 UTC (rev 1192) +++ trunk/pom.xml 2011-04-13 11:42:32 UTC (rev 1193) @@ -134,6 +134,14 @@ <version>1.6.1</version> <scope>runtime</scope> </dependency> + +  + <dependency> + <groupId>ical4j</groupId> + <artifactId>ical4j</artifactId> + <version>0.9.20</version> + </dependency> +  <dependency> <groupId>jfree</groupId> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-13 11:29:05 UTC (rev 1192) +++ trunk/wao-business/pom.xml 2011-04-13 11:42:32 UTC (rev 1193) @@ -67,8 +67,8 @@ </dependency>  <dependency> - <groupId>ical4j</groupId> - <artifactId>ical4j</artifactId> + <groupId>ical4j</groupId> + <artifactId>ical4j</artifactId> </dependency>  <dependency>

1 0

[Suiviobsmer-commits] r1192 - in trunk/wao-business: . src/main/java/fr/ifremer/wao/service src/test/java/fr/ifremer/wao/service
by sletellier＠users.labs.libre-entreprise.org April 13, 2011

April 13, 2011

Author: sletellier Date: 2011-04-13 11:29:05 +0000 (Wed, 13 Apr 2011) New Revision: 1192 Log: - Add ical4j dependency - Fill method ExportSamplingPlanICalendar - Fill test for ical Modified: trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-12 15:16:58 UTC (rev 1191) +++ trunk/wao-business/pom.xml 2011-04-13 11:29:05 UTC (rev 1192) @@ -65,6 +65,11 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> +  + <dependency> + <groupId>ical4j</groupId> + <artifactId>ical4j</artifactId> + </dependency>  <dependency> <groupId>net.sourceforge.javacsv</groupId> 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 2011-04-12 15:16:58 UTC (rev 1191) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-13 11:29:05 UTC (rev 1192) @@ -89,6 +89,19 @@ import fr.ifremer.wao.io.csv2.Import; import fr.ifremer.wao.io.csv2.ImportModel; import fr.ifremer.wao.io.csv2.models.SamplingPlanImportExportModel; +import net.fortuna.ical4j.data.CalendarOutputter; +import net.fortuna.ical4j.model.Property; +import net.fortuna.ical4j.model.TimeZone; +import net.fortuna.ical4j.model.TimeZoneRegistry; +import net.fortuna.ical4j.model.TimeZoneRegistryFactory; +import net.fortuna.ical4j.model.ValidationException; +import net.fortuna.ical4j.model.component.VEvent; +import net.fortuna.ical4j.model.component.VTimeZone; +import net.fortuna.ical4j.model.parameter.Value; +import net.fortuna.ical4j.model.property.CalScale; +import net.fortuna.ical4j.model.property.ProdId; +import net.fortuna.ical4j.model.property.Uid; +import net.fortuna.ical4j.model.property.Version; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; @@ -109,9 +122,12 @@ import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; import java.text.DateFormat; import java.text.NumberFormat; import java.text.ParseException; @@ -1510,18 +1526,64 @@ } @Override - protected InputStream executeExportSamplingPlanICalendar(TopiaContext transaction, ConnectedUser connectedUser) throws TopiaException { + protected InputStream executeExportSamplingPlanICalendar(TopiaContext transaction, ConnectedUser connectedUser) throws TopiaException, IOException, ValidationException, ParseException { SamplingFilter samplingFilter = executeNewSamplingFilter(transaction, connectedUser); List<SampleRow> samplingPlan = executeGetSampleRowsByFilter(transaction, samplingFilter); - // TODO 20110411 bleny make it generate an iCal + // Obord no sampling plan are found + if (samplingPlan.isEmpty()) { + log.warn("No samplingPlan found for user " + connectedUser.getLogin() + ", abording"); + return null; + } + + // Creating ical + net.fortuna.ical4j.model.Calendar cal = new net.fortuna.ical4j.model.Calendar(); + cal.getProperties().add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); + cal.getProperties().add(Version.VERSION_2_0); + cal.getProperties().add(CalScale.GREGORIAN); + + // Creating a TimeZone + TimeZoneRegistry registry = TimeZoneRegistryFactory.getInstance().createRegistry(); + TimeZone timezone = registry.getTimeZone("Europe/Paris"); + VTimeZone tz = timezone.getVTimeZone(); + + // Fills events + if (log.isDebugEnabled()) { + log.debug("Filling calendar with " + samplingPlan.size() + " sampling plans"); + } for (SampleRow sampleRow : samplingPlan) { - Date day = sampleRow.getDay(); + net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getDay()); String eventDescription = sampleRow.getObservationUnit().getDescription(); + if (log.isDebugEnabled()) { + log.debug("Creating event " + eventDescription + " at time " + day); + } + // add an event at 'day' in iCal + VEvent event = new VEvent(day, eventDescription); + + // add timezone information.. + event.getProperties().add(tz.getTimeZoneId()); + + // initialise as an all-day event.. + event.getProperties().getProperty(Property.DTSTART).getParameters().add( + Value.DATE); + + // Generate a UID for the event.. + Uid uid = new Uid(sampleRow.getTopiaId()); + event.getProperties().add(uid); + + // Add event + cal.getComponents().add(event); } - return null; + // Creating pipe + PipedOutputStream out = new PipedOutputStream(); + PipedInputStream in = new PipedInputStream(out); + + CalendarOutputter outputter = new CalendarOutputter(); + outputter.output(cal, out); + + return in; } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-12 15:16:58 UTC (rev 1191) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-13 11:29:05 UTC (rev 1192) @@ -40,6 +40,14 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserImpl; import fr.ifremer.wao.io.ImportResults; +import net.fortuna.ical4j.model.Calendar; +import net.fortuna.ical4j.model.Date; +import net.fortuna.ical4j.model.component.VEvent; +import net.fortuna.ical4j.model.parameter.Cn; +import net.fortuna.ical4j.model.parameter.Role; +import net.fortuna.ical4j.model.property.CalScale; +import net.fortuna.ical4j.model.property.ProdId; +import net.fortuna.ical4j.model.property.Version; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.junit.Assert; @@ -52,6 +60,7 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URI; import java.util.List; /** @@ -381,19 +390,22 @@ } @Test - @Ignore("not yet implemented") public void observerCanExportHisRoadMapAsICalendar() throws IOException, WaoBusinessException { // first, the coordinator must add observers coordinatorCanAddObserversViaImport(); + manager.setCurrentDate(DateUtil.createDate(10, 2, 2010)); ServiceSampling serviceSampling = manager.getServiceSampling(); InputStream in = serviceSampling.exportSamplingPlanICalendar(joshAsObserver()); + String result = IOUtils.toString(in); if (log.isDebugEnabled()) { - log.debug("exported iCal for observer is " + IOUtils.toString(in)); + log.debug("exported iCal for observer is " + result); } - // TODO 20110411 bleny add assertions + Assert.assertEquals(1, StringUtils.countMatches(result, "BEGIN:VEVENT")); + Assert.assertTrue(result.contains("DTSTART;VALUE=DATE:20100213")); + Assert.assertTrue(result.contains("SUMMARY:GA-UO007 DESHAIES_POINTE NOIRE")); } }

1 0

[Suiviobsmer-commits] r1191 - in trunk: . src/announcement wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 15:16:58 +0000 (Tue, 12 Apr 2011) New Revision: 1191 Log: prepare yet another release Added: trunk/src/announcement/release-email-2.1.6.txt Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-04-12 14:28:32 UTC (rev 1190) +++ trunk/changelog.txt 2011-04-12 15:16:58 UTC (rev 1191) @@ -3,6 +3,14 @@ Historique des versions +2.1.6 +----- + +Anomalies ++++++++++ + +- [bleny] #2644 : Filtrage dans les contacts + 2.1.5 ----- Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-12 14:28:32 UTC (rev 1190) +++ trunk/pom.xml 2011-04-12 15:16:58 UTC (rev 1191) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> <modules> <module>wao-ui</module> Added: trunk/src/announcement/release-email-2.1.6.txt =================================================================== --- trunk/src/announcement/release-email-2.1.6.txt (rev 0) +++ trunk/src/announcement/release-email-2.1.6.txt 2011-04-12 15:16:58 UTC (rev 1191) @@ -0,0 +1,17 @@ +La nouvelle version 2.1.6 de l'applicatif Wao est disponible. + +Corrections : + +- [bleny] #2644 : Filtrage dans les contacts + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-12 14:28:32 UTC (rev 1190) +++ trunk/wao-business/pom.xml 2011-04-12 15:16:58 UTC (rev 1191) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-12 14:28:32 UTC (rev 1190) +++ trunk/wao-ui/pom.xml 2011-04-12 15:16:58 UTC (rev 1191) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

[Suiviobsmer-commits] r1190 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by sletellier＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: sletellier Date: 2011-04-12 14:28:32 +0000 (Tue, 12 Apr 2011) New Revision: 1190 Log: Fix npe and fix doublons Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-04-12 14:17:58 UTC (rev 1189) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-04-12 14:28:32 UTC (rev 1190) @@ -180,7 +180,7 @@ if (selectedValues != null) { for (E sv : selectedValues) { if (!values.contains(sv)) { - values.add(selectedValue); + values.add(sv); } } } @@ -274,8 +274,14 @@ @Override public int compare(E o1, E o2) { - String compare1 = (String)propertyAdapter.get(o1); - String compare2 = (String)propertyAdapter.get(o2); + String compare1 = null; + if (o1 != null) { + compare1 = (String)propertyAdapter.get(o1); + } + String compare2 = null; + if (o2 != null) { + compare2 = (String)propertyAdapter.get(o2); + } return compare1 == null ? -1 : compare1.compareTo(compare2); }

1 0

[Suiviobsmer-commits] r1189 - trunk
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 14:17:58 +0000 (Tue, 12 Apr 2011) New Revision: 1189 Log: bakc to mavenpom 2.5.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-12 13:58:04 UTC (rev 1188) +++ trunk/pom.xml 2011-04-12 14:17:58 UTC (rev 1189) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.4-SNAPSHOT</version> + <version>2.5.3</version> </parent> <groupId>fr.ifremer</groupId>

1 0

[Suiviobsmer-commits] r1188 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 13:58:04 +0000 (Tue, 12 Apr 2011) New Revision: 1188 Log: fix autocompletion for boats in contact page Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 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 2011-04-12 13:57:20 UTC (rev 1187) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-04-12 13:58:04 UTC (rev 1188) @@ -35,6 +35,7 @@ import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.io.ImportResults; +import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; import fr.ifremer.wao.service.ServiceReferential; import fr.ifremer.wao.service.ServiceUser; @@ -94,10 +95,16 @@ @SessionState @Property private ConnectedUser user; - + @Inject + private ServiceBoat serviceBoat; + + @Inject private ServiceContact serviceContact; + @Inject + private ServiceReferential serviceReferential; + @Environmental private JavaScriptSupport javascriptSupport; @@ -207,9 +214,6 @@ // } // } - @Inject - private ServiceReferential serviceReferential; - // @Property // @Persist // private String terrestrialLocationId; @@ -267,6 +271,11 @@ // return filtersZone; // } + public String[] onProvideCompletionsFromBoatName(String input) throws WaoException { + List<String> results = serviceBoat.getBoatNamesStartWith(input); + return results.toArray(new String[results.size()]); + } + /**************************** CONTACT IMPORT/EXPORT ***********************/ @Property

1 0

[Suiviobsmer-commits] r1187 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 13:57:20 +0000 (Tue, 12 Apr 2011) New Revision: 1187 Log: fix list of observers in possible values Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-12 13:57:20 UTC (rev 1187) @@ -393,7 +393,10 @@ query.addEquals(sampleRowProperty.observationUnit(), filter.getObservationUnit()); } - if (filter.getObserver() != null) { + // XXX 2011 04 12 using UserFilter#observer for both samplingfilter and + // contact filter may lead to buggy filters (observers filters in contacts / obsdeb + // sampling plan) + if (filter.getObsProgram() == ObsProgram.OBSDEB && filter.getObserver() != null) { query.addInElements(":sampleRowObserver", sampleRowProperty.observers()); query.addParam("sampleRowObserver", filter.getObserver()); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-04-12 13:57:20 UTC (rev 1187) @@ -53,7 +53,7 @@ public void fillContacts(List<Contact> contacts) { for (Contact contact : contacts) { addObservers(contact.getMainObserver()); - addAllObservers(contact.getSecondaryObservers()); + // addAllObservers(contact.getSecondaryObservers()); fillSampleRow(contact.getSampleRow()); } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-12 13:57:20 UTC (rev 1187) @@ -49,11 +49,11 @@ title="Rafraîchir les filtres en fonction de la société sélectionnée"/--> </t:if> <label for="observer">${message:wao.ui.misc.observer} :</label> - <t:topiaEntitySelector t:id="observer" - t:clazzName="WaoUser" - t:labelPropertyName="fullName" - t:values="possibleValuesForFilter.observersAsList" - t:selectedValue="filter.observer"/>  + <t:topiaEntitySelector t:id="observer" + t:clazzName="WaoUser" + t:labelPropertyName="fullName" + t:values="possibleValuesForFilter.observersAsList" + t:selectedValue="filter.observer"/>   </div> <p> </p>

1 0

[Suiviobsmer-commits] r1186 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 10:07:44 +0000 (Tue, 12 Apr 2011) New Revision: 1186 Log: obsdeb test code style Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-12 09:21:21 UTC (rev 1185) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-12 10:07:44 UTC (rev 1186) @@ -158,6 +158,7 @@ /** * As an admin, i must be able to import a sampling plan + * @throws WaoBusinessException if import fail */ @Test public void adminCanImportSamplingPlan() throws WaoBusinessException { @@ -180,6 +181,7 @@ /** * As an admin, i should be able to read sampling plan + * @throws WaoBusinessException if a call to service fail */ @Test public void adminCanReadSamplingPlan() throws WaoBusinessException { @@ -233,13 +235,17 @@ // i can filter the sampling plan by getting a filter SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); - // and the possible values (here we only check that this - // doesn't raise any error + // and the possible values i can use to fill the filter SamplingFilterValues samplingFilterValues = serviceSampling.getPossibleValuesForFilter(samplingFilter); + + // according to the given sampling plan, there may be as many different values + // as different values used in the sampling plan, for example : two + // companies are used in the sampling plan so, 2 companies must be in + // the possible values + Assert.assertEquals(2, samplingFilterValues.getCompanies().size()); Assert.assertEquals(4, samplingFilterValues.getSampleRows().size()); Assert.assertEquals(2, samplingFilterValues.getObservationUnits().size()); Assert.assertEquals(0, samplingFilterValues.getObservers().size()); - Assert.assertEquals(2, samplingFilterValues.getCompanies().size()); samplingFilter = serviceSampling.newSamplingFilter(joshAsAdministrator()); samplingFilter.setPeriod(new PeriodDates(DateUtil.createDate(20, 2, 2010), @@ -257,6 +263,7 @@ /** * As an admin, i should be able to read sampling plan + * @throws WaoBusinessException if call to service fail */ @Test public void coordinatorCanReadSamplingPlan() throws WaoBusinessException { @@ -307,7 +314,6 @@ serviceSampling.importSamplingPlanCsv(IOUtils.toInputStream(CSV_WITH_OBSERVERS_CONTENT), joshAsCoordinator()); // now getting the sampling plan and checking that observers are linked to sample rows - samplingFilter = serviceSampling.newSamplingFilter(joshAsCoordinator()); SampleRow row2011_890 = serviceSampling.getSampleRowByCode(joshAsCoordinator(), "2011_890"); Assert.assertEquals(1, row2011_890.sizeObservers()); @@ -327,6 +333,8 @@ /** * We want to check that the coordinator is not able to create a bad sampling * plan by sending a same observer on two different place the same day + * @throws WaoBusinessException if call to service fail + * @throws java.io.IOException if failure while reading CSV */ @Test public void coordinatorCannotBreakSamplingPlan() throws IOException, WaoBusinessException {

1 0

[Suiviobsmer-commits] r1185 - trunk
by bleny＠users.labs.libre-entreprise.org April 12, 2011

April 12, 2011

Author: bleny Date: 2011-04-12 09:21:21 +0000 (Tue, 12 Apr 2011) New Revision: 1185 Log: update dependencies version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-12 09:14:02 UTC (rev 1184) +++ trunk/pom.xml 2011-04-12 09:21:21 UTC (rev 1185) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.3</version> + <version>2.5.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -200,7 +200,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.151</version> + <version>1.3.154</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -311,12 +311,12 @@ <labs.id>154</labs.id>  - <nuitonI18nVersion>2.3.1</nuitonI18nVersion> + <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <nuitonUtilsVersion>2.1.1</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> <eugeneVersion>2.3.3</eugeneVersion> - <tapestryVersion>5.2.4</tapestryVersion> + <tapestryVersion>5.2.5</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> <jfreeVersion>1.0.12</jfreeVersion> <jaxbVersion>2.2.3-1</jaxbVersion>

1 0