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

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

April 14, 2011

Author: sletellier Date: 2011-04-14 10:15:22 +0000 (Thu, 14 Apr 2011) New Revision: 1204 Log: Revert log level to debug 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-14 10:14:48 UTC (rev 1203) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-14 10:15:22 UTC (rev 1204) @@ -391,7 +391,7 @@ String result = IOUtils.toString(in); if (log.isDebugEnabled()) { - log.info("exported iCal for observer is " + result); + log.debug("exported iCal for observer is " + result); } Assert.assertEquals(1, StringUtils.countMatches(result, "BEGIN:VEVENT"));

1 0

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

April 14, 2011

Author: sletellier Date: 2011-04-14 10:14:48 +0000 (Thu, 14 Apr 2011) New Revision: 1203 Log: - Fill description and location on ical Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 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-14 09:32:09 UTC (rev 1202) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-14 10:14:48 UTC (rev 1203) @@ -99,6 +99,8 @@ 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.Description; +import net.fortuna.ical4j.model.property.Location; import net.fortuna.ical4j.model.property.ProdId; import net.fortuna.ical4j.model.property.Uid; import net.fortuna.ical4j.model.property.Version; @@ -117,6 +119,7 @@ import org.nuiton.util.TimeLog; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; +import org.omg.CORBA.NO_MEMORY; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,6 +130,7 @@ import java.io.InputStream; import java.io.PipedInputStream; import java.io.PipedOutputStream; +import java.net.URISyntaxException; import java.text.DateFormat; import java.text.NumberFormat; import java.text.ParseException; @@ -1549,11 +1553,27 @@ } for (SampleRow sampleRow : samplingPlan) { net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getDay()); - String eventTitle = "Observation ObsDeb"; + String eventTitle = WaoUtils.translate(n_("wao.export.ical.title")); String eventPlace = sampleRow.getObservationUnit().getDescription(); // liste des noms des observateurs (sauf le connected user) dans Property.Attendee - String eventDescription = "avec " + sampleRow.getObservers(); + Collection<WaoUser> observers = sampleRow.getObservers(); + observers.remove(connectedUser.getUser()); + String eventDescription = ""; + + if (!observers.isEmpty()) { + String observersNames = StringUtil.join(observers, new StringUtil.ToString<WaoUser>() { + + @Override + public String toString(WaoUser waoUser) { + return waoUser.getFullName(); + } + + }, ", ", true); + + eventDescription = WaoUtils.translate(n_("wao.export.ical.desc"), observersNames); + } + // au pire, tout mettre dans la description if (log.isDebugEnabled()) { @@ -1567,8 +1587,13 @@ event.getProperties().add(tz.getTimeZoneId()); // initialise as an all-day event.. - event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE); + event.getProperty(Property.DTSTART).getParameters().add(Value.DATE); + if (!StringUtils.isEmpty(eventDescription)) { + event.getProperties().add(new Description(eventDescription)); + } + event.getProperties().add(new Location(eventPlace)); + // Generate a UID for the event.. Uid uid = new Uid(sampleRow.getTopiaId()); event.getProperties().add(uid); Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-14 09:32:09 UTC (rev 1202) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-14 10:14:48 UTC (rev 1203) @@ -253,3 +253,5 @@ wao.import.contact.failure.wrongTerrestrialLocation=There is no location of type '%s' with code '%s' wao.import.failure.wrongUser=There is no user with login '%s' wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s +wao.export.ical.title=ObsDeb Observation +wao.export.ical.desc=wtih %s \ No newline at end of file Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-14 09:32:09 UTC (rev 1202) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-14 10:14:48 UTC (rev 1203) @@ -253,3 +253,5 @@ wao.import.contact.failure.wrongTerrestrialLocation=Il n'y a pas de lieu de type '%s' ayant pour code '%s' wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut \u00EAtre associ\u00E9 \u00E0 la ligne %s car il doit observer, le m\u00EAme jour, pour la ligne %s +wao.export.ical.title=Observation ObsDeb +wao.export.ical.desc=avec %s \ No newline at end of file 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-14 09:32:09 UTC (rev 1202) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-04-14 10:14:48 UTC (rev 1203) @@ -40,18 +40,9 @@ 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; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; @@ -60,7 +51,6 @@ import java.io.IOException; import java.io.InputStream; -import java.net.URI; import java.util.List; /** @@ -401,11 +391,13 @@ String result = IOUtils.toString(in); if (log.isDebugEnabled()) { - log.debug("exported iCal for observer is " + result); + log.info("exported iCal for observer is " + result); } 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")); + Assert.assertTrue(result.contains("TZID:Europe/Paris")); + Assert.assertTrue(result.contains("LOCATION:GA-UO007 DESHAIES_POINTE NOIRE")); + Assert.assertTrue(result.contains("SUMMARY:Observation ObsDeb")); } }

1 0

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

April 14, 2011

Author: sletellier Date: 2011-04-14 09:32:09 +0000 (Thu, 14 Apr 2011) New Revision: 1202 Log: Set file name to ical export Return empty file if no sampling plan found Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 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-14 09:23:52 UTC (rev 1201) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-14 09:32:09 UTC (rev 1202) @@ -1529,7 +1529,7 @@ // Obord no sampling plan are found if (samplingPlan.isEmpty()) { log.warn("No samplingPlan found for user " + connectedUser.getLogin() + ", abording"); - return null; + return IOUtils.toInputStream(""); } // Creating ical Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 2011-04-14 09:23:52 UTC (rev 1201) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 2011-04-14 09:32:09 UTC (rev 1202) @@ -1,5 +1,6 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; @@ -10,9 +11,11 @@ import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.Response; +import org.nuiton.util.DateUtil; import java.io.IOException; import java.io.InputStream; +import java.util.Date; /** * Page to acces to ical export for SamplingPlan. The activate method @@ -41,6 +44,7 @@ protected class ICalStreamResponse implements StreamResponse { protected InputStream inputStream; + public ICalStreamResponse(InputStream inputStream) { this.inputStream = inputStream; } @@ -57,6 +61,9 @@ @Override public void prepareResponse(Response response) { + Date current = WaoUtils.getCurrentDate(); + response.setHeader("Content-Disposition", + "attachment; filename=\"observation_obsdeb_" + DateUtil.formatDate(current, "dd-MM-yyyy") + ".ical" +"\""); } } }

1 0

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

April 14, 2011

Author: bleny Date: 2011-04-14 09:23:52 +0000 (Thu, 14 Apr 2011) New Revision: 1201 Log: fix LIE when exporting iCal Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 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 2011-04-13 13:48:30 UTC (rev 1200) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2011-04-14 09:23:52 UTC (rev 1201) @@ -84,11 +84,6 @@ @Override public boolean hasUserRole(UserRole userRole) { // true if user has a profile with the role whatever the program - for (UserProfile profile : getUserProfile()) { - if (profile.getUserRole() == userRole) { - return true; - } - } return hasUserRole(userRole, getUserProfile()); } 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 2011-04-13 13:48:30 UTC (rev 1200) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-04-14 09:23:52 UTC (rev 1201) @@ -82,8 +82,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; 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-13 13:48:30 UTC (rev 1200) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-14 09:23:52 UTC (rev 1201) @@ -370,12 +370,12 @@ BinderModelBuilder.newEmptyBuilder(SampleRow.class); // add properties common to all programs - sampleRowBinderModelBuilder.addSimpleProperties(SampleRow.PROPERTY_COMPANY); + sampleRowBinderModelBuilder.addSimpleProperties(SampleRow.PROPERTY_COMPANY, + SampleRow.PROPERTY_COMMENT); // plus per-program properties if (ObsProgram.OBSDEB.equals(row.getObsProgram())) { sampleRowBinderModelBuilder.addSimpleProperties( - SampleRow.PROPERTY_COMMENT, SampleRow.PROPERTY_DAY, SampleRow.PROPERTY_GROUP_NAME, SampleRow.PROPERTY_OBSERVERS, @@ -391,7 +391,6 @@ // SampleRow.PROPERTY_D_CF5_CODE, // SampleRow.PROPERTY_SAMPLE_MONTH, SampleRow.PROPERTY_FISHING_ZONES_INFOS, - SampleRow.PROPERTY_COMMENT, SampleRow.PROPERTY_PROGRAM_NAME, SampleRow.PROPERTY_PERIOD_BEGIN, SampleRow.PROPERTY_PERIOD_END, @@ -1475,9 +1474,7 @@ samplingFilter.setObserver(connectedUser.getUser()); } - if (connectedUser.isObsDeb() && connectedUser.isObserver()) { - samplingFilter.setOrderBy(SampleRow.PROPERTY_DAY); - } + samplingFilter.setOrderBy(SampleRow.PROPERTY_DAY); return samplingFilter; } @@ -1552,21 +1549,25 @@ } for (SampleRow sampleRow : samplingPlan) { net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getDay()); - String eventDescription = sampleRow.getObservationUnit().getDescription(); + String eventTitle = "Observation ObsDeb"; + String eventPlace = sampleRow.getObservationUnit().getDescription(); + // liste des noms des observateurs (sauf le connected user) dans Property.Attendee + String eventDescription = "avec " + sampleRow.getObservers(); + // au pire, tout mettre dans la description + if (log.isDebugEnabled()) { log.debug("Creating event " + eventDescription + " at time " + day); } // add an event at 'day' in iCal - VEvent event = new VEvent(day, eventDescription); + VEvent event = new VEvent(day, eventTitle); // add timezone information.. event.getProperties().add(tz.getTimeZoneId()); // initialise as an all-day event.. - event.getProperties().getProperty(Property.DTSTART).getParameters().add( - Value.DATE); + event.getProperties().getProperty(Property.DTSTART).getParameters().add(Value.DATE); // Generate a UID for the event.. Uid uid = new Uid(sampleRow.getTopiaId()); 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 2011-04-13 13:48:30 UTC (rev 1200) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-04-14 09:23:52 UTC (rev 1201) @@ -561,16 +561,18 @@ result.setUser(user); // Determine role for this one - if (user.hasUserRole(UserRole.COORDINATOR, ObsProgram.OBSDEB)) { - UserProfile userProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.COORDINATOR, false); - result.setProfile(userProfile); - } else if (user.hasUserRole(UserRole.OBSERVER, ObsProgram.OBSDEB)) { + if (user.hasUserRole(UserRole.COORDINATOR, ObsProgram.OBSDEB) || + user.hasUserRole(UserRole.OBSERVER, ObsProgram.OBSDEB)) { + // as coordinator, auth as observer UserProfile userProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.OBSERVER, false); result.setProfile(userProfile); } else { throw new IllegalArgumentException("User " + user.getLogin() + " is not allowed to use tokenId"); } + // force load + user.getCompany(); + return result; } } 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-13 13:48:30 UTC (rev 1200) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-14 09:23:52 UTC (rev 1201) @@ -44,9 +44,8 @@ <label for="fromDate">${message:wao.ui.misc.since} :</label> <input t:type="datefield" class="width70" t:id="fromDate" value="filter.fromDate" />  - <label for="state">${message:wao.ui.field.Contact.contactState} :</label> -  + <label for="state">${message:wao.ui.field.Contact.contactState} :</label> <select t:type="select" t:id="state" value="filter.state" @@ -187,13 +186,11 @@ </div> <t:if t:test="user.obsVente"> <label for="samplingStrategy">${message:wao.ui.field.SampleRow.samplingStrategy}</label> -  <input t:type="select" t:id="samplingStrategy" value="filter.samplingStrategy" /> <label for="actualSamplingStrategy">${message:wao.ui.field.Contact.samplingStrategy}</label> -  <input t:type="select" t:id="actualSamplingStrategy" value="filter.actualSamplingStrategy" />

1 0

[Suiviobsmer-commits] r1200 - in trunk: 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/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by sletellier＠users.labs.libre-entreprise.org April 13, 2011

April 13, 2011

Author: sletellier Date: 2011-04-13 13:48:30 +0000 (Wed, 13 Apr 2011) New Revision: 1200 Log: First implementation of RoadMap (ical) on ui Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 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 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -124,4 +124,11 @@ public boolean isObsDeb() { return isProgram(ObsProgram.OBSDEB); } + + @Override + public String getTokenId() { + + // TODO sletellier 20110413 : change this with a real tokenid + return getUser().getPassword(); + } } 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 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -32,6 +32,7 @@ import java.io.Serializable; import java.util.ArrayList; +import java.util.Collection; import java.util.List; /** @@ -88,6 +89,20 @@ return true; } } + return hasUserRole(userRole, getUserProfile()); + } + + @Override + public boolean hasUserRole(UserRole userRole, ObsProgram obsProgram) { + return hasUserRole(userRole, getUserProfile(obsProgram)); + } + + protected boolean hasUserRole(UserRole userRole, Collection<UserProfile> userProfiles) { + for (UserProfile profile : userProfiles) { + if (profile.getUserRole() == userRole) { + return true; + } + } return false; } 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-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -122,7 +122,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; 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 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -44,6 +44,7 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowLog; import fr.ifremer.wao.entity.SampleRowLogDAO; +import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.UserProfile; import fr.ifremer.wao.entity.UserProfileDAO; import fr.ifremer.wao.entity.UserProfileImpl; @@ -543,4 +544,33 @@ transaction.commitTransaction(); } + + @Override + protected ConnectedUser executeGetConnectedUserByToken(TopiaContext transaction, String tokenId) throws Exception { + WaoUserDAO waoUserDAO = WaoDAOHelper.getWaoUserDAO(transaction); + + // TODO sletellier 20110413 : change this with a real tokenid + WaoUser user = waoUserDAO.findByPassword(tokenId); + + if (user == null) { + throw new IllegalArgumentException("tokenId is not valid"); + } + + ConnectedUserImpl result = new ConnectedUserImpl(); + + result.setUser(user); + + // Determine role for this one + if (user.hasUserRole(UserRole.COORDINATOR, ObsProgram.OBSDEB)) { + UserProfile userProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.COORDINATOR, false); + result.setProfile(userProfile); + } else if (user.hasUserRole(UserRole.OBSERVER, ObsProgram.OBSDEB)) { + UserProfile userProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.OBSERVER, false); + result.setProfile(userProfile); + } else { + throw new IllegalArgumentException("User " + user.getLogin() + " is not allowed to use tokenId"); + } + + return result; + } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-04-13 13:48:30 UTC (rev 1200) @@ -238,8 +238,10 @@ wao.error.serviceUser.forgetPassword= wao.error.serviceUser.getCompanies= wao.error.serviceUser.getCompany= +wao.error.serviceUser.getConnectedUserByToken= wao.error.serviceUser.getNewUser= wao.error.serviceUser.getObservers= +wao.error.serviceUser.getUserByToken= wao.error.serviceUser.getUserRolesByLogin= wao.error.serviceUser.getUsersByCompany= wao.import.contact.failure.boatMissing=You need to precise the plate number of the boat associated to the contact Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-04-13 13:48:30 UTC (rev 1200) @@ -238,8 +238,10 @@ wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s wao.error.serviceUser.getCompany= +wao.error.serviceUser.getConnectedUserByToken= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs +wao.error.serviceUser.getUserByToken= wao.error.serviceUser.getUserRolesByLogin= wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s wao.import.contact.failure.boatMissing=Il faut pr\u00E9ciser l'immatriculation du navire associ\u00E9 au contact Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -22,8 +22,11 @@ import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.ui.pages.RoadMap; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PageRenderLinkSource; import java.util.Calendar; @@ -35,6 +38,9 @@ */ public class Footer { + @Inject + private PageRenderLinkSource pageRender; + @Parameter @Property private ConnectedUser connectedUser; @@ -47,4 +53,8 @@ Calendar calendar = Calendar.getInstance(); return calendar.get(Calendar.YEAR); } + + public String getRoadMapUrl() { + return pageRender.createPageRenderLinkWithContext(RoadMap.class, connectedUser.getTokenId()).toURI(); + } } Added: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java (rev 0) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/RoadMap.java 2011-04-13 13:48:30 UTC (rev 1200) @@ -0,0 +1,62 @@ +package fr.ifremer.wao.ui.pages; + +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.ui.data.RequiresAuthentication; +import fr.ifremer.wao.ui.data.TapestryUtil; +import org.apache.tapestry5.StreamResponse; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.Response; + +import java.io.IOException; +import java.io.InputStream; + +/** + * Page to acces to ical export for SamplingPlan. The activate method + * will return the StreamResponse with ical data. + * + * @author sletellier + */ +public class RoadMap { + + @Inject + private ServiceSampling serviceSampling; + + @Inject + private ServiceUser serviceUser; + + StreamResponse onActivate(Object... activationContext) throws IOException { + + String tokenId = TapestryUtil.getFirstString(activationContext); + + ConnectedUser connectedUser = serviceUser.getConnectedUserByToken(tokenId); + + InputStream inputStream = serviceSampling.exportSamplingPlanICalendar(connectedUser); + + return new ICalStreamResponse(inputStream); + } + + protected class ICalStreamResponse implements StreamResponse { + protected InputStream inputStream; + public ICalStreamResponse(InputStream inputStream) { + this.inputStream = inputStream; + } + + @Override + public String getContentType() { + return "text/calendar"; + } + + @Override + public InputStream getStream() throws IOException { + return inputStream; + } + + @Override + public void prepareResponse(Response response) { + } + } +} 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 2011-04-13 13:10:04 UTC (rev 1199) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2011-04-13 13:48:30 UTC (rev 1200) @@ -54,6 +54,7 @@ ${message:wao.ui.disclaimer} </p> </t:if> + ${roadMapUrl} </div>

1 0

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

April 13, 2011

Author: bleny Date: 2011-04-13 13:10:04 +0000 (Wed, 13 Apr 2011) New Revision: 1199 Log: add missing file headers Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ValidationResultImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java 2011-04-13 12:52:47 UTC (rev 1198) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.bean; import fr.ifremer.wao.entity.Boat; 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-13 12:52:47 UTC (rev 1198) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.bean; import fr.ifremer.wao.entity.Boat; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ValidationResultImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ValidationResultImpl.java 2011-04-13 12:52:47 UTC (rev 1198) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ValidationResultImpl.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.bean; import org.apache.commons.lang.builder.ToStringBuilder; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-13 12:52:47 UTC (rev 1198) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BoatFilterComponent.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.components; import fr.ifremer.wao.WaoException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java 2011-04-13 12:52:47 UTC (rev 1198) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/ContactFilterComponent.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.components; import fr.ifremer.wao.bean.ContactFilter; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-04-13 12:52:47 UTC (rev 1198) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.components; import fr.ifremer.wao.bean.ConnectedUser; 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-13 12:52:47 UTC (rev 1198) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-13 13:10:04 UTC (rev 1199) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters">

1 0

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

April 13, 2011

Author: bleny Date: 2011-04-13 12:52:47 +0000 (Wed, 13 Apr 2011) New Revision: 1198 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-13 12:52:44 UTC (rev 1197) +++ trunk/pom.xml 2011-04-13 12:52:47 UTC (rev 1198) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6</version> + <version>3.0-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -337,12 +337,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6 + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6?root=suiviob… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-13 12:52:44 UTC (rev 1197) +++ trunk/wao-business/pom.xml 2011-04-13 12:52:47 UTC (rev 1198) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -240,10 +240,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-business</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-13 12:52:44 UTC (rev 1197) +++ trunk/wao-ui/pom.xml 2011-04-13 12:52:47 UTC (rev 1198) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,10 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-ui</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1197 - in tags: . wao-2.1.6
by bleny＠users.labs.libre-entreprise.org April 13, 2011

April 13, 2011

Author: bleny Date: 2011-04-13 12:52:44 +0000 (Wed, 13 Apr 2011) New Revision: 1197 Log: [maven-release-plugin] copy for tag wao-2.1.6 Added: tags/wao-2.1.6/ Property changes on: tags/wao-2.1.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

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

April 13, 2011

Author: bleny Date: 2011-04-13 12:50:45 +0000 (Wed, 13 Apr 2011) New Revision: 1196 Log: [maven-release-plugin] prepare release wao-2.1.6 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-13 12:41:57 UTC (rev 1195) +++ trunk/pom.xml 2011-04-13 12:50:45 UTC (rev 1196) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> <modules> <module>wao-ui</module> @@ -337,12 +337,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6 </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6?root=suiviob… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-04-13 12:41:57 UTC (rev 1195) +++ trunk/wao-business/pom.xml 2011-04-13 12:50:45 UTC (rev 1196) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -240,10 +240,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6/?root=suivio… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-04-13 12:41:57 UTC (rev 1195) +++ trunk/wao-ui/pom.xml 2011-04-13 12:50:45 UTC (rev 1196) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.6-SNAPSHOT</version> + <version>2.1.6</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,10 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.6/?root=suivio… </url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.6/wao-ui</developerConnection> </scm> </project>

1 0

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

April 13, 2011

Author: bleny Date: 2011-04-13 12:41:57 +0000 (Wed, 13 Apr 2011) New Revision: 1195 Log: add license for dependencie Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-04-13 12:24:24 UTC (rev 1194) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-04-13 12:41:57 UTC (rev 1195) @@ -1,6 +1,7 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - ASL 2.0 # - Affero General Public License (AGPL) # - Apache Software License - Version 2.0 # - Apache Software License 2.0 @@ -31,15 +32,17 @@ # - The H2 License, Version 1.0 # - The MIT License # - The OpenSymphony Software License, Version 1.1 +# - no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Feb 21 12:16:55 CET 2011 +#Wed Apr 13 14:45:24 CEST 2011 antlr--antlr--2.7.6--jar=BSD com.formos.tapestry--tapestry-testify--1.0.3--jar=no licence (see http://tapestry.formos.com/nightly/tapestry-testify/license.html) 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.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0