Nuiton-web-commits

Download

nuiton-web-commits@list.nuiton.org

January 2011

4 participants
22 discussions

r36 - trunk
by fdesbois＠users.nuiton.org Jan. 7, 2011

Jan. 7, 2011

Author: fdesbois Date: 2011-01-07 11:17:55 +0100 (Fri, 07 Jan 2011) New Revision: 36 Url: http://nuiton.org/repositories/revision/nuiton-web/36 Log: clean pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-07 09:58:15 UTC (rev 35) +++ trunk/pom.xml 2011-01-07 10:17:55 UTC (rev 36) @@ -1,173 +1,170 @@ <?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> -  -  -  +  +  +  - <parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4.1</version> + </parent> + + <artifactId>nuiton-web</artifactId> + <version>0.2-SNAPSHOT</version> + + <modules> + <module>nuiton-tapestry-extra</module> +  + </modules> + + <dependencyManagement> + + <dependencies> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <artifactId>nuiton-web</artifactId> - <version>0.2-SNAPSHOT</version> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> - <modules> - <module>nuiton-tapestry-extra</module> -  - </modules> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>compile</scope> + </dependency> - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestryVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> -  -  - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> -  -  -  + </dependencies> - <name>Nuiton-web</name> - <description>Common ressources for web applications</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-web/</url> + </dependencyManagement> -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>florian.desbois(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> +  +  +  -  -  -  + <name>Nuiton-web</name> + <description>Common ressources for web applications</description> + <inceptionYear>2010</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-web/</url> - <packaging>pom</packaging> +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian DESBOIS</name> + <email>fdesbois(a)codelutin.com</email> + <organization>Code Lutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <properties> +  +  +  -  - <projectId>nuiton-web</projectId> + <packaging>pom</packaging> -  - <tapestryVersion>5.2.4</tapestryVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <properties> -  - <siteLocales>en,fr</siteLocales> +  + <projectId>nuiton-web</projectId> -  - <license.licenseName>lgpl_v3</license.licenseName> +  + <tapestryVersion>5.2.4</tapestryVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <slf4jVersion>1.6.1</slf4jVersion> - </properties> +  + <tapestryVersion>5.1.0.5</tapestryVersion> + <nuitonUtilsVersion>1.2.2</nuitonUtilsVersion> - <build> +  + <siteLocales>en,fr</siteLocales> - <pluginManagement> - <plugins> +  + <license.licenseName>lgpl_v3</license.licenseName> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + </properties> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> + <build> - <reporting> -  - <excludeDefaults>true</excludeDefaults> - </reporting> + <pluginManagement> + <plugins> -  -  -  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> - </scm> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> + <reporting> +  + <excludeDefaults>true</excludeDefaults> + </reporting> + +  +  +  + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + </scm> + </project>

1 0

r35 - in trunk: . nuiton-tapestry-extra/src/main/java/org/nuiton/web/tapestry5/components
by bleny＠users.nuiton.org Jan. 7, 2011

Jan. 7, 2011

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>  - <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>  <siteLocales>en,fr</siteLocales>

1 0