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

[Suiviobsmer-commits] r487 - in trunk: wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/java/fr/ifremer/wao/ui/services
by fdesbois＠users.labs.libre-entreprise.org 31 May '10

31 May '10

Author: fdesbois Date: 2010-05-31 14:54:17 +0000 (Mon, 31 May 2010) New Revision: 487 Log: Ano #2322 : Add context to display activityCalendar. Manage also authentification filter to keep context on Connexion page. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/xmi/wao.zargo 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/Connexion.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 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-05-27 15:42:47 UTC (rev 486) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-05-31 14:54:17 UTC (rev 487) @@ -309,11 +309,22 @@ @Override public Boat executeGetBoat(TopiaContext transaction, - String boatId) throws TopiaException { + Integer boatImmatriculation) + throws TopiaException, WaoBusinessException { BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); - return dao.findByTopiaId(boatId); + Boat result = dao.findByImmatriculation(boatImmatriculation); + + if (result == null) { + throw new WaoBusinessException( + WaoBusinessException.Type.NOT_EXISTS, + ServiceBoat.class, + "Aucun navire correspondant à l'immatriculation " + + boatImmatriculation); + } + + return result; } @Override Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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-05-27 15:42:47 UTC (rev 486) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-05-31 14:54:17 UTC (rev 487) @@ -25,6 +25,7 @@ package fr.ifremer.wao.ui.pages; +import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.entity.ActivityCalendar; import fr.ifremer.wao.entity.ActivityMonth; @@ -33,11 +34,13 @@ import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import java.util.Collections; import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -58,6 +61,9 @@ @Inject private Logger log; + + @InjectComponent + private Layout layout; @Inject private ServiceBoat serviceBoat; @@ -79,33 +85,56 @@ @Property private int zoneIndex; - @Persist private Boat boat; + private Integer boatImmatriculation; + void setupRender() { - + if (boatImmatriculation == null) { + layout.addFatal("Page inaccessible, aucun navire chargé" + + " permettant l'affichage du calendrier d'activité." + + " Veuillez retourner sur la page des navires."); + } else { + try { + getBoat(); + } catch (WaoBusinessException eee) { + layout.addFatal(eee.getMessage()); + } + } } + void onActivate(Integer boatImmatriculation) { + this.boatImmatriculation = boatImmatriculation; + } + + Integer onPassivate() { + return boatImmatriculation; + } + + @Deprecated public void setBoat(Boat boat) { this.boat = boat; } - public Boat getBoat() { - return this.boat; + public Boat getBoat() throws WaoBusinessException { + if (boat == null) { + boat = serviceBoat.getBoat(boatImmatriculation); + } + return boat; } public List<Boat> getBoats() { return Collections.singletonList(boat); } - public ActivityCalendar getActivityCalendar() throws WaoException { + public ActivityCalendar getActivityCalendar() throws WaoBusinessException { if (activityCalendar == null) { this.activityCalendar = serviceBoat.getLastActivityCalendar(user, getBoat()); } return activityCalendar; } - public ActivityMonth getActivityMonth() throws WaoException { + public ActivityMonth getActivityMonth() throws WaoBusinessException { return getActivityCalendar().getActivityMonth(month); } @@ -129,7 +158,7 @@ return getProfessionIndexMax() != -1; } - public ActivityProfession getActivityProfession() throws WaoException { + public ActivityProfession getActivityProfession() throws WaoBusinessException { if (getActivityMonth() == null) { return null; } @@ -139,7 +168,7 @@ return getActivityMonth().getActivityProfession().get(professionIndex); } - public int getZoneIndexMax() throws WaoException { + public int getZoneIndexMax() throws WaoBusinessException { int result = 0; for (ActivityMonth activityMonth : activityCalendar.getActivityMonth()) { month = activityMonth.getMonth(); @@ -166,7 +195,7 @@ // return getZoneIndexMax() != -1; // } - public ActivityZone getActivityZone() throws WaoException { + public ActivityZone getActivityZone() throws WaoBusinessException { ActivityProfession profession = getActivityProfession(); if (profession == null) { return null; @@ -179,7 +208,7 @@ /*************************** RETURN LINK **********************************/ - public Object[] getBoatsPageContext() { + public Object[] getBoatsPageContext() throws WaoBusinessException { return new Object[] {null, getBoat().getImmatriculation()}; } 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-05-27 15:42:47 UTC (rev 486) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-05-31 14:54:17 UTC (rev 487) @@ -66,6 +66,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.EventContext; +import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.IncludeStylesheet; @@ -79,6 +80,7 @@ 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; @@ -846,16 +848,23 @@ /**************************** Go to last ActivityCalendar *****************/ - @InjectPage - private BoatActivityCalendar calendarPage; +// @InjectPage +// private BoatActivityCalendar calendarPage; + @Inject + private PageRenderLinkSource renderLink; + public boolean hasActivityCalendar() throws WaoException { return getBoatSelected() != null && getBoatSelected().sizeActivityCalendar() != 0; } - Object onActionFromShowLastActivityCalendar() throws WaoException { - calendarPage.setBoat(getBoatSelected()); - return calendarPage; + Link onActionFromShowLastActivityCalendar() throws WaoException { + Link result = renderLink.createPageRenderLinkWithContext( + BoatActivityCalendar.class, + getBoatSelected().getImmatriculation()); + return result; +// calendarPage.setBoat(getBoatSelected()); +// return calendarPage; } } 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-05-27 15:42:47 UTC (rev 486) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-05-31 14:54:17 UTC (rev 487) @@ -7,6 +7,8 @@ import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.components.FeedBack; +import org.apache.tapestry5.EventContext; +import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; @@ -17,6 +19,8 @@ import org.apache.tapestry5.services.PageRenderLinkSource; import org.slf4j.Logger; +import java.util.Arrays; + /** * Login * @@ -45,6 +49,8 @@ @InjectComponent private FeedBack connexionFeedback; + private Object[] activationContext; + private String redirectPage; /** @@ -60,14 +66,35 @@ @Property private String email; - void onActivate(String page) { - this.redirectPage = page; + void onActivate(Object... activationContext) { + if (logger.isDebugEnabled()) { + logger.debug("Activiation context : " + + Arrays.toString(activationContext)); + } + this.activationContext = activationContext; } - String onPassivate() { + Object[] onPassivate() { + return activationContext; + } + + String getRedirectPageName() { + if (redirectPage == null && activationContext.length > 0) { + redirectPage = (String)activationContext[0]; + } return redirectPage; } + Object[] getRedirectPageContext() { + if (activationContext.length > 1) { + Object[] redirectPageContext = + Arrays.copyOfRange(activationContext, 1, + activationContext.length); + return redirectPageContext; + } + return null; + } + void onValidateFormFromConnexionForm() { try { if (logger.isDebugEnabled()) { @@ -98,11 +125,28 @@ if (hasConnexionErrors()) { return this; } - // If redirectPage is defined, return a new Link to this page - if (redirectPage == null) { + // If redirectPage is not defined, the default one is the Index page + if (getRedirectPageName() == null) { redirectPage = "index"; } - return pageRender.createPageRenderLink(redirectPage); + + Object[] redirectPageContext = getRedirectPageContext(); + Link redirectLink = null; + + if (logger.isDebugEnabled()) { + logger.debug("Redirect page '" + redirectPage + "' " + + "context : " + Arrays.toString(redirectPageContext)); + } + + // Check existence of redirectPageContext, the redirectLink depends on + // context + if (redirectPageContext == null) { + redirectLink = pageRender.createPageRenderLink(redirectPage); + } else { + redirectLink = pageRender.createPageRenderLinkWithContext( + redirectPage, redirectPageContext); + } + return redirectLink; } public boolean hasConnexionErrors() { 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-05-27 15:42:47 UTC (rev 486) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/RequiresAuthenticationFilter.java 2010-05-31 14:54:17 UTC (rev 487) @@ -5,7 +5,11 @@ import fr.ifremer.wao.ui.pages.Connexion; import fr.ifremer.wao.ui.pages.Unavailable; import java.io.IOException; -import org.apache.commons.collections.CollectionUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.tapestry5.EventContext; import org.apache.tapestry5.Link; import org.apache.tapestry5.runtime.Component; import org.apache.tapestry5.services.ComponentEventRequestParameters; @@ -61,7 +65,10 @@ logger.trace("handleComponentEvent"); } - if (dispatchedToLoginPage(parameters.getActivePageName())) { + Object[] context = prepareContext( + parameters.getActivePageName(), + parameters.getPageActivationContext()); + if (dispatchedToLoginPage(context)) { return; } @@ -77,15 +84,37 @@ logger.trace("handlePageRender"); } - if (dispatchedToLoginPage(parameters.getLogicalPageName())) { + Object[] context = prepareContext( + parameters.getLogicalPageName(), + parameters.getActivationContext()); + if (dispatchedToLoginPage(context)) { return; } handler.handlePageRender(parameters); } - private boolean dispatchedToLoginPage(String pageName) throws IOException { + /** + * Prepare the context for redirect page. + * + * @param pageName the pageName to treate + * @param activationContext the EventContext of this page + * @return an array of Object for Context + */ + protected Object[] prepareContext(String pageName, + EventContext activationContext) { + List<Object> list = new ArrayList<Object>(); + list.add(pageName); + for (int i = 0; i < activationContext.getCount(); i++) { + list.add(activationContext.get(Object.class, i)); + } + return list.toArray(new Object[list.size()]); + } + private boolean dispatchedToLoginPage(Object... context) + throws IOException { + + String pageName = (String)context[0]; Component page = componentSource.getPage(pageName); if (logger.isTraceEnabled()) { @@ -95,6 +124,7 @@ page.getClass().isAnnotationPresent(RequiresAuthentication.class)); logger.trace("User in session : " + serviceAuthentication.isUserConnected()); + logger.trace("Activation context : " + Arrays.toString(context)); } if (!page.getClass().isAnnotationPresent(RequiresAuthentication.class)) { @@ -120,7 +150,7 @@ } Link link = pageRender.createPageRenderLinkWithContext(redirectPage, - pageName); + context); if (logger.isTraceEnabled()) { logger.trace("Redirection to " + redirectPage.getSimpleName() +

1 0

[Suiviobsmer-commits] r486 - in trunk/wao-business: . src/main/filters
by fdesbois＠users.labs.libre-entreprise.org 27 May '10

27 May '10

Author: fdesbois Date: 2010-05-27 15:42:47 +0000 (Thu, 27 May 2010) New Revision: 486 Log: Bug on filtering maven properties seems to be resolved in some mavenpom plugin version update Modified: trunk/wao-business/pom.xml trunk/wao-business/src/main/filters/Wao.properties Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-05-25 13:25:38 UTC (rev 485) +++ trunk/wao-business/pom.xml 2010-05-27 15:42:47 UTC (rev 486) @@ -100,7 +100,6 @@  <build> -   <resources> <resource> Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-05-25 13:25:38 UTC (rev 485) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-05-27 15:42:47 UTC (rev 486) @@ -48,4 +48,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=1.2.1 \ No newline at end of file +wao.version=${project.version} \ No newline at end of file

1 0

[Suiviobsmer-commits] r485 - trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components
by fdesbois＠users.labs.libre-entreprise.org 25 May '10

25 May '10

Author: fdesbois Date: 2010-05-25 13:25:38 +0000 (Tue, 25 May 2010) New Revision: 485 Log: Update google analytics java script Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 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-05-06 12:18:27 UTC (rev 484) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2010-05-25 13:25:38 UTC (rev 485) @@ -40,15 +40,18 @@ <t:unless t:test="devEnvironment">  <script type="text/javascript"> - var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); - document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-12982015-1']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> - <script type="text/javascript"> - try { - var pageTracker = _gat._getTracker("UA-12982015-1"); - pageTracker._trackPageview(); - } catch(err) {} - </script> </t:unless> <div id="so-session" class="clearfix"> <div class="fleft">

1 0

[Suiviobsmer-commits] r484 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 06 May '10

06 May '10

Author: fdesbois Date: 2010-05-06 12:18:27 +0000 (Thu, 06 May 2010) New Revision: 484 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 2010-05-06 12:18:22 UTC (rev 483) +++ trunk/pom.xml 2010-05-06 12:18:27 UTC (rev 484) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1?root=suiviob…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-05-06 12:18:22 UTC (rev 483) +++ trunk/wao-business/pom.xml 2010-05-06 12:18:27 UTC (rev 484) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -193,9 +193,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-business</developerConnection> + <url>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/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-05-06 12:18:22 UTC (rev 483) +++ trunk/wao-ui/pom.xml 2010-05-06 12:18:27 UTC (rev 484) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -223,9 +223,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1/?root=suivio…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-ui</developerConnection> + <url>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/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r483 - tags
by fdesbois＠users.labs.libre-entreprise.org 06 May '10

06 May '10

Author: fdesbois Date: 2010-05-06 12:18:22 +0000 (Thu, 06 May 2010) New Revision: 483 Log: [maven-release-plugin] copy for tag wao-1.2.1 Added: tags/wao-1.2.1/

1 0

[Suiviobsmer-commits] r482 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org 06 May '10

06 May '10

Author: fdesbois Date: 2010-05-06 12:18:18 +0000 (Thu, 06 May 2010) New Revision: 482 Log: [maven-release-plugin] prepare release wao-1.2.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-06 12:13:23 UTC (rev 481) +++ trunk/pom.xml 2010-05-06 12:18:18 UTC (rev 482) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> <modules> <module>wao-ui</module> @@ -246,9 +246,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1?root=suiviob…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-05-06 12:13:23 UTC (rev 481) +++ trunk/wao-business/pom.xml 2010-05-06 12:18:18 UTC (rev 482) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -193,9 +193,9 @@ </build> <scm> - <url>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/trunk/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-05-06 12:13:23 UTC (rev 481) +++ trunk/wao-ui/pom.xml 2010-05-06 12:18:18 UTC (rev 482) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.2.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -223,9 +223,9 @@ </repositories> <scm> - <url>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/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.2.1/?root=suivio…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.2.1/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r481 - trunk/src/announcement
by fdesbois＠users.labs.libre-entreprise.org 06 May '10

06 May '10

Author: fdesbois Date: 2010-05-06 12:13:23 +0000 (Thu, 06 May 2010) New Revision: 481 Log: Add announcement email for 1.2.1 Added: trunk/src/announcement/release-email-1.2.1.txt Added: trunk/src/announcement/release-email-1.2.1.txt =================================================================== --- trunk/src/announcement/release-email-1.2.1.txt (rev 0) +++ trunk/src/announcement/release-email-1.2.1.txt 2010-05-06 12:13:23 UTC (rev 481) @@ -0,0 +1,29 @@ + +La nouvelle version 1.2.1 de l'applicatif Wao est disponible ! Cette version +corrige les anomalies détectées dans la version 1.2. + +Résolution d'anomalies : + +- Le test de l'utilisateur connecté se fait sur le Layout alors que la page est + chargé avant. [fdesbois-Ano#2287] +- Filtre sur les observateurs de la page contact ne + fonctionne pas. [fdesbois-Ano#2286] +- Problème de sauvegarde de l'observateur sur un contact. [fdesbois-Ano#2287] +- Doublon sur les navires éligibles pour une ligne. [fdesbois-Ano#2282] + +Mise à jour librairie : + +- mavenpom4labs 2.1 -> 2.1.3 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao + Property changes on: trunk/src/announcement/release-email-1.2.1.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

[Suiviobsmer-commits] r480 - in trunk: . wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/webapp/WEB-INF
by fdesbois＠users.labs.libre-entreprise.org 06 May '10

06 May '10

Author: fdesbois Date: 2010-05-06 12:09:14 +0000 (Thu, 06 May 2010) New Revision: 480 Log: - Add test to avoid NPE when retrieve data from DataSource. - Update changelog - Add comment code for session-timeout time Modified: trunk/changelog.txt trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java trunk/wao-ui/src/main/webapp/WEB-INF/web.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-05-06 11:56:07 UTC (rev 479) +++ trunk/changelog.txt 2010-05-06 12:09:14 UTC (rev 480) @@ -9,6 +9,8 @@ Anomalies +++++++++ +- [fdesbois] Ano : Le test de l'utilisateur connecté se fait sur le Layout alors + que la page est chargé avant. - [fdesbois] Ano #2286 : Filtre sur les observateurs de la page contact ne fonctionne pas. - [fdesbois] Ano #2287 : Problème de sauvegarde de l'observateur sur un contact. 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-05-06 11:56:07 UTC (rev 479) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-05-06 12:09:14 UTC (rev 480) @@ -178,14 +178,23 @@ public abstract Class<?> getRowType(); public E get(K key) { + if (mapResults == null) { + return null; + } return mapResults.get(key); } public List<E> values() { + if (listResults == null) { + listResults = new ArrayList<E>(); + } return listResults; } public boolean contains(K key) { + if (mapResults == null) { + return false; + } return mapResults.containsKey(key); } Modified: trunk/wao-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-05-06 11:56:07 UTC (rev 479) +++ trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-05-06 12:09:14 UTC (rev 480) @@ -43,5 +43,8 @@ <filter-name>app</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + </web-app>

1 0

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

06 May '10

Author: fdesbois Date: 2010-05-06 11:56:07 +0000 (Thu, 06 May 2010) New Revision: 479 Log: Improve equals in ActivityCalendar import + add last version in properties file Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-05-04 12:29:11 UTC (rev 478) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-05-06 11:56:07 UTC (rev 479) @@ -48,4 +48,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=1.2 \ No newline at end of file +wao.version=1.2.1 \ No newline at end of file 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-05-04 12:29:11 UTC (rev 478) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-05-06 11:56:07 UTC (rev 479) @@ -105,9 +105,16 @@ @Override public boolean equals(Object key) { - if (!ActivityCalendarKey.class.isAssignableFrom(key.getClass())) { - throw new ClassCastException("Unable to cast object " + key.getClass() + " to " + this.getClass().getName()); + if (key == this) { + return true; } +// if (!ActivityCalendarKey.class.isAssignableFrom(key.getClass())) { +// throw new ClassCastException("Unable to cast object " + +// key.getClass() + " to " + this.getClass().getName()); +// } + if (! (key instanceof ActivityCalendarKey)) { + return false; + } ActivityCalendarKey calendarKey = (ActivityCalendarKey)key; return year == calendarKey.year() && boatId.equals(calendarKey.boatId()); }

1 0

[Suiviobsmer-commits] r478 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 04 May '10

04 May '10

Author: fdesbois Date: 2010-05-04 12:29:11 +0000 (Tue, 04 May 2010) New Revision: 478 Log: Add default page to redirect if not defined Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 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-05-03 20:05:40 UTC (rev 477) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-05-04 12:29:11 UTC (rev 478) @@ -99,6 +99,9 @@ return this; } // If redirectPage is defined, return a new Link to this page + if (redirectPage == null) { + redirectPage = "index"; + } return pageRender.createPageRenderLink(redirectPage); }

1 0