Author: bleny Date: 2010-12-31 15:52:58 +0000 (Fri, 31 Dec 2010) New Revision: 874 Log: remove deprecated tapestry annot. usage 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/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java 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-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-12-31 15:52:58 UTC (rev 874) @@ -36,7 +36,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -55,7 +55,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/boats.css") + at Import(stylesheet = "context:css/boats.css") public class BoatActivityCalendar { @Inject 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-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-12-31 15:52:58 UTC (rev 874) @@ -57,7 +57,7 @@ import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.InjectPage; import org.apache.tapestry5.annotations.Persist; @@ -86,7 +86,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/boats.css") + at Import(stylesheet = "context:css/boats.css") public class Boats extends AbstractFilteredPage { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-12-31 15:52:58 UTC (rev 874) @@ -20,14 +20,22 @@ */ package fr.ifremer.wao.ui.pages; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactFilter; +import fr.ifremer.wao.bean.ContactFilterImpl; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.bean.WaoFilter; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.service.ServiceSampling; import fr.ifremer.wao.service.ServiceUser; import fr.ifremer.wao.ui.data.FiltersModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.tapestry5.Link; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; 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-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Connexion.java 2010-12-31 15:52:58 UTC (rev 874) @@ -35,7 +35,11 @@ import fr.ifremer.wao.ui.services.ServiceAuthentication; import org.apache.tapestry5.Link; import org.apache.tapestry5.PersistenceConstants; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; @@ -54,7 +58,7 @@ * @author fdesbois * $Id$ */ - at IncludeJavaScriptLibrary("context:js/wao.js") + at Import(library = "context:js/wao.js") public class Connexion { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -23,8 +23,7 @@ import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; @@ -52,8 +51,7 @@ * */ @RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}, readOnlyAllowed = false) - at IncludeStylesheet("context:css/common.css") - at IncludeJavaScriptLibrary("context:js/contactForm.js") + at Import(stylesheet = "context:css/common.css", library = "context:js/contactForm.js") public class ContactForm { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-31 15:52:58 UTC (rev 874) @@ -54,7 +54,13 @@ import org.apache.tapestry5.Field; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.corelib.components.Zone; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-12-31 15:52:58 UTC (rev 874) @@ -32,8 +32,7 @@ import org.apache.tapestry5.Asset2; import org.apache.tapestry5.PersistenceConstants; import org.apache.tapestry5.RenderSupport; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.annotations.Persist; @@ -55,8 +54,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/news.css") - at IncludeJavaScriptLibrary("context:js/news.js") + at Import(stylesheet = "context:css/news.css", library = "context:js/news.js") public class Index { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-12-31 15:52:58 UTC (rev 874) @@ -25,7 +25,7 @@ import fr.ifremer.wao.entity.IndicatorLog; import fr.ifremer.wao.service.ServiceSynthesis; import fr.ifremer.wao.ui.data.RequiresAuthentication; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.annotations.Inject; @@ -40,7 +40,7 @@ * @author bleny */ @RequiresAuthentication(allowedPrograms = {ObsProgram.OBSMER}, allowedRoles = {UserRole.ADMIN}, readOnlyAllowed = true) - at IncludeStylesheet("context:css/common.css") + at Import(stylesheet = "context:css/common.css") public class IndicatorsHistory { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -26,7 +26,12 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; +import fr.ifremer.wao.bean.SamplingStrategy; +import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; @@ -53,7 +58,12 @@ import org.apache.tapestry5.Field; import org.apache.tapestry5.OptionModel; import org.apache.tapestry5.SelectModel; -import org.apache.tapestry5.annotations.*; +import org.apache.tapestry5.annotations.Import; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.beaneditor.BeanModel; import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.internal.OptionModelImpl; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-12-31 15:52:58 UTC (rev 874) @@ -35,7 +35,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -55,7 +55,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/sampling.css") + at Import(stylesheet = "context:css/sampling.css") public class SampleRowHistoric { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-12-31 15:52:58 UTC (rev 874) @@ -26,7 +26,11 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.bean.*; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.FacadeRow; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleMonth; @@ -40,7 +44,7 @@ import fr.ifremer.wao.ui.services.WaoManager; import org.apache.commons.lang.BooleanUtils; import org.apache.tapestry5.StreamResponse; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; @@ -72,7 +76,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/sampling.css") + at Import(stylesheet = "context:css/sampling.css") public class SamplingPlan extends AbstractFilteredPage { @Inject Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-12-31 15:52:58 UTC (rev 874) @@ -54,7 +54,7 @@ import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; @@ -85,7 +85,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication(allowedPrograms = {ObsProgram.OBSMER}, allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) - at IncludeStylesheet("context:css/synthesis.css") + at Import(stylesheet = "context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { @Environmental Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java 2010-12-31 15:14:08 UTC (rev 873) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfileForm.java 2010-12-31 15:52:58 UTC (rev 874) @@ -33,7 +33,7 @@ import fr.ifremer.wao.ui.components.Layout; import fr.ifremer.wao.ui.data.RequiresAuthentication; import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -48,7 +48,7 @@ * @author fdesbois <fdesbois at codelutin.com> */ @RequiresAuthentication - at IncludeStylesheet("context:css/userProfile.css") + at Import(stylesheet = "context:css/userProfile.css") public class UserProfileForm { @Inject