Author: bleny Date: 2011-01-07 10:58:15 +0100 (Fri, 07 Jan 2011) New Revision: 35 Url: http://nuiton.org/repositories/revision/nuiton-web/35 Log: update to Tapestry 5.2 ; remove use of a deprecated Tapestry stuff Modified: trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java trunk/pom.xml Modified: trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java =================================================================== --- trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2010-11-21 14:31:44 UTC (rev 34) +++ trunk/nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java 2011-01-07 09:58:15 UTC (rev 35) @@ -24,7 +24,6 @@ import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.EventConstants; import org.apache.tapestry5.MarkupWriter; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.Events; import org.apache.tapestry5.annotations.Parameter; @@ -34,6 +33,7 @@ import org.apache.tapestry5.services.FormSupport; import org.apache.tapestry5.services.Heartbeat; import org.apache.tapestry5.services.Request; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; /** * Corresponds to <input type="submit">, a client-side element that can @@ -97,7 +97,7 @@ private Request request; @Inject - private RenderSupport renderSupport; + private JavaScriptSupport javaScriptSupport; private Element element; @@ -188,11 +188,11 @@ this.defer = defer; } - void setup(ComponentResources resources, FormSupport formSupport, Heartbeat heartbeat, RenderSupport renderSupport) { + void setup(ComponentResources resources, FormSupport formSupport, Heartbeat heartbeat, JavaScriptSupport javaScriptSupport) { this.resources = resources; this.formSupport = formSupport; this.heartbeat = heartbeat; - this.renderSupport = renderSupport; + this.javaScriptSupport = javaScriptSupport; } /** @@ -204,7 +204,7 @@ */ public String getClientId() { if (clientId == null) { - clientId = renderSupport.allocateClientId(resources); + clientId = javaScriptSupport.allocateClientId(resources); element.forceAttributes("id", clientId); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:31:44 UTC (rev 34) +++ trunk/pom.xml 2011-01-07 09:58:15 UTC (rev 35) @@ -47,13 +47,13 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> + <version>${slf4jVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> + <version>${slf4jVersion}</version> <scope>runtime</scope> </dependency> <!--dependency> @@ -117,8 +117,9 @@ <projectId>nuiton-web</projectId> <!-- customized versions --> - <tapestryVersion>5.1.0.5</tapestryVersion> - <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion> + <tapestryVersion>5.2.4</tapestryVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <slf4jVersion>1.6.1</slf4jVersion> <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales>