r38 - in trunk: . nuiton-tapestry nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components
Author: fdesbois Date: 2011-01-07 11:25:59 +0100 (Fri, 07 Jan 2011) New Revision: 38 Url: http://nuiton.org/repositories/revision/nuiton-web/38 Log: rename nuiton-tapestry-extra to nuiton-tapestry Added: trunk/nuiton-tapestry/ Removed: trunk/nuiton-tapestry-extra/ Modified: trunk/nuiton-tapestry/pom.xml trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry-extra/pom.xml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/pom.xml 2011-01-07 10:25:59 UTC (rev 38) @@ -1,87 +1,94 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-web</artifactId> - <version>0.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.nuiton-web</groupId> - <artifactId>nuiton-tapestry-extra</artifactId> + <artifactId>nuiton-tapestry</artifactId> + <dependencies> - <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <name>Nuiton-web :: Tapestry Extra</name> - <description>Extra classes for Tapestry based applications</description> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <compress>true</compress> - <index>true</index> - <!-- Add NuitonModule to manifest for Tapestry IOC engine --> - <manifestEntries> - <Tapestry-Module-Classes> - org.nuiton.web.tapestry5.services.NuitonModule - </Tapestry-Module-Classes> - <Implementation-Version> - ${project.version} - </Implementation-Version> - </manifestEntries> - </archive> - </configuration> - </plugin> + </dependencies> - </plugins> - </build> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>Nuiton-web :: Tapestry</name> + <description>Extra classes for Tapestry based applications</description> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <compress>true</compress> + <index>true</index> + <!-- Add NuitonModule to manifest for Tapestry IOC engine --> + <manifestEntries> + <Tapestry-Module-Classes> + org.nuiton.web.tapestry5.services.NuitonModule + </Tapestry-Module-Classes> + <Implementation-Version> + ${project.version} + </Implementation-Version> + </manifestEntries> + </archive> + </configuration> + </plugin> + + </plugins> + </build> + + </project> Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/annotations/RequiresAuthentication.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.annotations; import java.lang.annotation.Documented; @@ -10,15 +9,15 @@ /** * This annotation is used on pages and components that need authentication * to be rendered. - * + * <p/> * Created: 3 mai 2010 * * @author fdesbois - * $Id$ + * $Id$ */ -@Target({ ElementType.TYPE }) +@Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface RequiresAuthentication { - + } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/FeedBack.java 2011-01-07 10:25:59 UTC (rev 38) @@ -19,9 +19,6 @@ package org.nuiton.web.tapestry5.components; -import java.util.ArrayList; -import java.util.List; - import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.MarkupWriter; @@ -30,16 +27,19 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.annotations.Inject; +import java.util.ArrayList; +import java.util.List; + /** * Composant qui affiche des messages à l'utilisateur. - * + * <p/> * Ce composant permet d'afficher des messages avec une apparence différente * selon leur type (info ou erreur). Lors de l'affichage de la page, les * messages seront affichés et la collection de messages sera vidée. - * + * <p/> * Pour personnaliser l'apparence des messages il faut définir les classes * fb-error et fb-info dans le CSS. - * + * <p/> * <pre> * Utilisation : * <t:feedback t:id="feedback"/> @@ -54,13 +54,17 @@ @IncludeStylesheet("feedback.css") public class FeedBack { - @Parameter(defaultPrefix = BindingConstants.LITERAL, value= "true") + @Parameter(defaultPrefix = BindingConstants.LITERAL, value = "true") private boolean autoClear; - /** Messages d'erreur */ + /** + * Messages d'erreur + */ private List<String> errorMessages; - /** Messages d'info */ + /** + * Messages d'info + */ private List<String> infoMessages; private boolean errors; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubForm.java 2011-01-07 10:25:59 UTC (rev 38) @@ -10,7 +10,10 @@ * * @author fdesbois <fdesbois@codelutin.com> * @version $Id: SubForm.java 3003 2010-05-19 18:25:58Z fdesbois $ + * @deprecated since 0.2, will be removed in next version. Useless since Select + * component could have zone in Tapestry 5.2 */ +@Deprecated public class SubForm { @Parameter Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/data/AbstractMappedGridDataSource.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,9 +1,5 @@ - package org.nuiton.web.tapestry5.data; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.beaneditor.PropertyModel; import org.apache.tapestry5.grid.ColumnSort; @@ -12,11 +8,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * AbstractMappedGridDataSource - * + * <p/> * TODO : javadoc - * + * <p/> * Created: 18 janv. 2010 * * @param <K> Type of the map key @@ -39,14 +39,16 @@ private boolean prepared; - /** Need to be provided by subclass, used by Grid component **/ + /** + * Need to be provided by subclass, used by Grid component * + */ @Override public abstract Class<?> getRowType(); protected abstract int count(); protected abstract Map<K, E> execute(int startIndex, int endIndex, - SortConstraint orderBy); + SortConstraint orderBy); @Override public int getAvailableRows() { @@ -61,7 +63,7 @@ @Override public void prepare(int startIndex, int endIndex, - List<SortConstraint> sortConstraints) { + List<SortConstraint> sortConstraints) { if (log.isDebugEnabled()) { log.debug("Prepare results : " + startIndex + ", " + endIndex); } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/Confirm.java 2011-01-07 10:25:59 UTC (rev 38) @@ -15,9 +15,9 @@ * * @author fdesbois * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * <p/> + * Last update: $Date$ + * by : $Author$ */ @IncludeJavaScriptLibrary("confirm.js") public class Confirm { @@ -39,10 +39,10 @@ @AfterRender public void afterRender() { - if (!wDisabled) { - renderSupport.addScript(String.format("new Confirm('%s', '%s', %b);", - element.getClientId(), message.replace("'", "\\'"), condition)); - } + if (!wDisabled) { + renderSupport.addScript(String.format("new Confirm('%s', '%s', %b);", + element.getClientId(), message.replace("'", "\\'"), condition)); + } } } Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-01-07 10:25:59 UTC (rev 38) @@ -37,15 +37,15 @@ * * @author ingesol * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * <p/> + * Last update: $Date$ + * by : $Author$ */ @IncludeJavaScriptLibrary("zoneUpdater.js") public class ZoneUpdater { public static final String PLACEHOLDER = "XXX"; - + @Inject private ComponentResources resources; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/AbstractAuthenticationFilter.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,7 +1,5 @@ package org.nuiton.web.tapestry5.services; -import java.io.IOException; -import java.lang.annotation.Annotation; import org.apache.tapestry5.Link; import org.apache.tapestry5.runtime.Component; import org.apache.tapestry5.services.ComponentEventRequestParameters; @@ -14,15 +12,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.lang.annotation.Annotation; + /** * AbstractAuthenticationFilter - * + * <p/> * Created: 3 mai 2010 * * @param <U> type of User * @param <A> type of Annotation that manage authentication on pages/components * @author fdesbois - * $Id$ + * $Id$ */ public abstract class AbstractAuthenticationFilter<U, A extends Annotation> implements ComponentRequestFilter { @@ -45,12 +46,12 @@ } protected abstract Class<?> getRedirectPage( - AuthenticationRedirect redirectType); + AuthenticationRedirect redirectType); public AbstractAuthenticationFilter(PageRenderLinkSource renderLinkSource, - ComponentSource componentSource, Response response, - ServiceAuthentication<U> serviceAuthentication, - Class<A> annotationClass) { + ComponentSource componentSource, Response response, + ServiceAuthentication<U> serviceAuthentication, + Class<A> annotationClass) { this.pageRender = renderLinkSource; this.componentSource = componentSource; this.response = response; @@ -66,7 +67,7 @@ public void handleComponentEvent( ComponentEventRequestParameters parameters, ComponentRequestHandler handler) throws IOException { - + if (logger.isTraceEnabled()) { logger.trace("handleComponentEvent"); } @@ -81,7 +82,7 @@ @Override public void handlePageRender(PageRenderRequestParameters parameters, - ComponentRequestHandler handler) throws IOException { + ComponentRequestHandler handler) throws IOException { if (logger.isTraceEnabled()) { logger.trace("handlePageRender"); Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBinding.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,24 +1,25 @@ package org.nuiton.web.tapestry5.services; -import java.util.ArrayList; -import java.util.List; import org.apache.tapestry5.Binding; import org.apache.tapestry5.internal.bindings.AbstractBinding; import org.apache.tapestry5.ioc.Location; import org.apache.tapestry5.ioc.Messages; +import java.util.ArrayList; +import java.util.List; + /** * From <a href="http://wiki.apache.org/tapestry/Tapestry5HowToAddMessageFormatBindingPrefix">Tapestry5HowTo</a> * <h2>Usage :</h2> * <pre> * ${format:key=value1,value2} or <t:component t:parameter="format:key=value1,value2"> * </pre> - * + * <p/> * Created: 27 avr. 2010 * + * @author fdesbois + * $Id$ * @see FormatBindingFactory - * @author fdesbois - * $Id$ */ public class FormatBinding extends AbstractBinding { @@ -28,7 +29,7 @@ private final List<Binding> valueBindings; public FormatBinding(Location location, Messages messages, boolean invariant, - ArrayList<Binding> keyBindings, List<Binding> valueBindings) { + ArrayList<Binding> keyBindings, List<Binding> valueBindings) { super(location); this.messages = messages; Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/FormatBindingFactory.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,8 +1,5 @@ package org.nuiton.web.tapestry5.services; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.apache.tapestry5.Binding; import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ComponentResources; @@ -10,6 +7,10 @@ import org.apache.tapestry5.services.BindingFactory; import org.apache.tapestry5.services.BindingSource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * From <a href="http://wiki.apache.org/tapestry/Tapestry5HowToAddMessageFormatBindingPrefix">Tapestry5HowTo</a> * <br \> @@ -21,11 +22,11 @@ * configuration.add("format", new FormatBindingFactory(bindingSource)); * } * </pre> - * + * <p/> * Created: 27 avr. 2010 * * @author fdesbois - * $Id$ + * $Id$ */ public class FormatBindingFactory implements BindingFactory { @@ -42,7 +43,7 @@ @Override public Binding newBinding(String description, ComponentResources container, ComponentResources component, - String expression, Location location) { + String expression, Location location) { int separatorIndex = expression.indexOf(SEPARATOR); if (-1 == separatorIndex) { @@ -66,8 +67,8 @@ } private ArrayList<Binding> createBindings(String description, ComponentResources container, - ComponentResources component, String defaultPrefix, - List<String> expressions, Location location) { + ComponentResources component, String defaultPrefix, + List<String> expressions, Location location) { ArrayList<Binding> bindings = new ArrayList<Binding>(expressions.size()); for (String expression : expressions) { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/NuitonModule.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.services; import org.apache.tapestry5.ioc.Configuration; @@ -9,11 +8,11 @@ /** * NuitonModule - * + * <p/> * Created: 4 mai 2010 * * @author fdesbois - * $Id$ + * $Id$ */ public class NuitonModule { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,4 +1,3 @@ - package org.nuiton.web.tapestry5.services; /** @@ -28,27 +27,27 @@ * MappedConfiguration<Class<?>, * ApplicationStateContribution> configuration, * final ServiceAuthentication<MyUser> serviceAuthentication) { - * + * <p/> * ApplicationStateCreator<MyUser> creator = * new ApplicationStateCreator<MyUser>() { - * + * <p/> * @Override * public MyUser create() { * return serviceAuthentication.getNewUserInstance(); * } * }; - * + * <p/> * configuration.add(MyUser.class, * new ApplicationStateContribution("session", creator)); * } * </pre> - * - * + * <p/> + * <p/> * Created: 3 mai 2010 * * @param <U> user type * @author fdesbois - * $Id$ + * $Id$ */ public interface ServiceAuthentication<U> { Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java 2011-01-07 10:25:59 UTC (rev 38) @@ -1,10 +1,10 @@ - package org.nuiton.web.tapestry5.services; -import java.lang.annotation.Annotation; import org.apache.tapestry5.ioc.internal.util.TapestryException; import org.apache.tapestry5.services.ApplicationStateManager; +import java.lang.annotation.Annotation; + /** * This class is an abstract implementation of {@link ServiceAuthentication}. * This service use {@link ApplicationStateManager} to manage connected user. @@ -26,13 +26,13 @@ * No need to contribute to ApplicationStateManager to provide instantiation * of user. Even this service used the default constructor to instanciate a new * user. - * + * <p/> * Created: 3 mai 2010 * * @param <U> user type * @param <A> annotation type used to identify which page need authentication * @author fdesbois - * $Id$ + * $Id$ */ public class ServiceAuthenticationImpl<U, A extends Annotation> implements ServiceAuthentication<U> { @@ -40,12 +40,12 @@ /** * Tapestry service used to save user in session and retrieve it when * needed. - **/ + */ private final ApplicationStateManager stateManager; - /** + /** * User type - **/ + */ protected Class<U> userClass; /** @@ -57,13 +57,13 @@ /** * Constructor to call in subclasses. * - * @param stateManager from Tapestry - * @param userClass to identify which type of user is managed + * @param stateManager from Tapestry + * @param userClass to identify which type of user is managed * @param annotationClass to identify which type of annotation is managed - * for authentication treatment. + * for authentication treatment. */ public ServiceAuthenticationImpl(ApplicationStateManager stateManager, - Class<U> userClass, Class<A> annotationClass) { + Class<U> userClass, Class<A> annotationClass) { this.stateManager = stateManager; this.userClass = userClass; this.annotationClass = annotationClass; @@ -106,14 +106,14 @@ // No restriction if annotation is not present return true; } - + /** * Check the connected user authorizations. Called in * {@link #isAllowed(Class)} method after detect the annotation on the * current page. Override this method to provide more specific * authentication managment. * - * @param user current user connected. + * @param user current user connected. * @param annotation from page to check authorizations. * @return true if the user is granted, false otherwise */ Modified: trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml =================================================================== --- trunk/nuiton-tapestry-extra/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/nuiton-tapestry/src/main/resources/org/nuiton/web/tapestry5/components/SubForm.tml 2011-01-07 10:25:59 UTC (rev 38) @@ -1,14 +1,16 @@ -<!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"> +<!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"> - <t:delegate t:to="activeBlock" /> - <t:block t:id="formBlock"> - <form t:type="form" action="tapestry"> - <t:body /> - </form> - </t:block> - <t:block t:id="noFormBlock"> - <t:body /> - </t:block> +<t:delegate t:to="activeBlock"/> +<t:block t:id="formBlock"> + <form t:type="form" action="tapestry"> + <t:body/> + </form> +</t:block> +<t:block t:id="noFormBlock"> + <t:body/> +</t:block> </html> \ No newline at end of file
participants (1)
-
fdesbois@users.nuiton.org