December 2013 - Nuiton-web-commits - mailman.cloud.codelutin.com

r294 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by tchemit＠users.nuiton.org 25 Dec '13

25 Dec '13

Author: tchemit Date: 2013-12-25 17:58:50 +0100 (Wed, 25 Dec 2013) New Revision: 294 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/294 Log: refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-gwt/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,6 +10,9 @@ <artifactId>nuiton-gwt</artifactId> + <name>Nuiton Web :: Nuiton GWT</name> + <description>Extra classes for GWT based applications</description> + <dependencies>  @@ -21,9 +23,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton GWT</name> - <description>Extra classes for GWT based applications</description> - <build> <plugins> <plugin> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-rss/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -23,7 +23,6 @@ #L% --> <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> <parent> @@ -33,7 +32,21 @@ </parent> <artifactId>nuiton-rss</artifactId> + <packaging>war</packaging> + <name>Nuiton Web :: Nuiton RSS</name> + <description>Servlet pouvant etre appeler depuis du JS pour recuperer un + flux RSS + </description> + <inceptionYear>2008</inceptionYear> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies> <dependency> @@ -84,34 +97,7 @@ </dependencies> - <name>Nuiton Web :: Nuiton RSS</name> - <description>Servlet pouvant etre appeler depuis du JS pour recuperer un - flux RSS - </description> - <inceptionYear>2008</inceptionYear> - - <packaging>war</packaging> - - <properties> - -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> - - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </plugin> - - </plugins> - <pluginManagement> <plugins> @@ -137,6 +123,16 @@ </plugins> </pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </plugin> + + </plugins> </build> <profiles> @@ -205,5 +201,4 @@ </profile> </profiles> - </project> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-security/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -10,7 +9,11 @@ </parent> <artifactId>nuiton-security</artifactId> + <packaging>jar</packaging> + <name>Nuiton Web :: Nuiton Security</name> + <description>Security module based on ToPIA</description> + <properties>  @@ -72,11 +75,6 @@ </dependency> </dependencies> - <name>Nuiton Web :: Nuiton Security</name> - <description>Security module based on ToPIA</description> - - <packaging>jar</packaging> - <build> <plugins> <plugin> @@ -121,4 +119,5 @@ </plugin> </plugins> </build> + </project> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-struts2/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-tapestry/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,6 +10,9 @@ <artifactId>nuiton-tapestry</artifactId> + <name>Nuiton Web :: Nuiton Tapestry</name> + <description>Extra classes for Tapestry based applications</description> + <dependencies> <dependency> @@ -55,9 +57,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton Tapestry</name> - <description>Extra classes for Tapestry based applications</description> - <build> <plugins> <plugin> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/nuiton-web/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,7 +1,6 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,6 +11,17 @@ <artifactId>nuiton-web</artifactId> + <name>Nuiton Web :: Nuiton Web</name> + <description>Usefull classes for web developpement.</description> + <inceptionYear>2011</inceptionYear> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies>  @@ -57,17 +67,6 @@ </dependencies> - <name>Nuiton Web :: Nuiton Web</name> - <description>Usefull classes for web developpement.</description> - <inceptionYear>2011</inceptionYear> - - <properties> - -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> </build> @@ -114,5 +113,4 @@ </profile> </profiles> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-25 16:56:23 UTC (rev 293) +++ trunk/pom.xml 2013-12-25 16:58:50 UTC (rev 294) @@ -1,6 +1,5 @@ <?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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,7 +11,56 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> <version>1.15-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Nuiton Web</name> + <description>Common ressources for web applications</description> + <url>http://maven-site.nuiton.org/nuiton-web/</url> + <inceptionYear>2010</inceptionYear> + + <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> + <developer> + <id>jcouteau</id> + <name>Jean Couteau</name> + <email>couteau(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>bleny</id> + <name>Brendan Le Ny</name> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + <modules> <module>nuiton-web</module> <module>nuiton-struts2</module> @@ -22,6 +70,58 @@ <module>nuiton-security</module> </modules> + <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://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + + <properties> + +  + <projectId>nuiton-web</projectId> + + <eugeneVersion>2.7.3</eugeneVersion> + + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> + <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + + <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + +  + <tapestryVersion>5.2.4</tapestryVersion>  + <slf4jVersion>1.7.5</slf4jVersion> + +  + <gwtVersion>2.2.0</gwtVersion> + <gwtPluginVersion>2.2.0</gwtPluginVersion> + +  + <struts2Version>2.3.16</struts2Version> + + <shiroVersion>1.2.2</shiroVersion> + <servletApiVersion>2.5</servletApiVersion> + <jettyVersion>${jettyPluginVersion}</jettyVersion> + <windstoneVersion>0.9.10-hudson-24</windstoneVersion> + +  + <siteLocales>en,fr</siteLocales> + +  + <license.licenseName>lgpl_v3</license.licenseName> + + </properties> + <dependencyManagement> <dependencies> @@ -197,96 +297,13 @@ </dependencyManagement> - <name>Nuiton Web</name> - <description>Common ressources for web applications</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-web/</url> - - <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> - <developer> - <id>jcouteau</id> - <name>Jean Couteau</name> - <email>couteau(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>bleny</id> - <name>Brendan Le Ny</name> - <email>bleny(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <packaging>pom</packaging> - - <properties> - -  - <projectId>nuiton-web</projectId> - - <eugeneVersion>2.7.3</eugeneVersion> - - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - - <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> - -  - <tapestryVersion>5.2.4</tapestryVersion>  - <slf4jVersion>1.7.5</slf4jVersion> - -  - <gwtVersion>2.2.0</gwtVersion> - <gwtPluginVersion>2.2.0</gwtPluginVersion> - -  - <struts2Version>2.3.16</struts2Version> - - <shiroVersion>1.2.2</shiroVersion> - <servletApiVersion>2.5</servletApiVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> - <windstoneVersion>0.9.10-hudson-24</windstoneVersion> - -  - <siteLocales>en,fr</siteLocales> - -  - <license.licenseName>lgpl_v3</license.licenseName> - - </properties> - <build> - + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <pluginManagement> <plugins> @@ -320,13 +337,6 @@ </plugin> </plugins> </pluginManagement> - - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> </build> <reporting> @@ -334,21 +344,6 @@ <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://nuiton.org/projects/nuiton-web/repository/show/trunk</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <profiles> <profile> <id>reporting</id>

1 0

r293 - in trunk: . nuiton-gwt nuiton-rss nuiton-rss/src/site nuiton-struts2 nuiton-struts2/src/site nuiton-tapestry nuiton-web nuiton-web/src/site src/site
by tchemit＠users.nuiton.org 25 Dec '13

25 Dec '13

Author: tchemit Date: 2013-12-25 17:56:23 +0100 (Wed, 25 Dec 2013) New Revision: 293 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/293 Log: refs #2987: updates mavenpom to 4.5 + tidy poms and site.xml Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-rss/src/site/site_fr.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/site/site_fr.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/nuiton-web/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-gwt/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -25,20 +21,9 @@ </dependencies> -  -  -  - <name>Nuiton Web :: Nuiton GWT</name> <description>Extra classes for GWT based applications</description> -  -  -  - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -26,10 +26,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -88,21 +84,12 @@ </dependencies> - -  -  -  - <name>Nuiton Web :: Nuiton RSS</name> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un flux RSS </description> <inceptionYear>2008</inceptionYear> -  -  -  - <packaging>war</packaging> <properties> @@ -152,10 +139,6 @@ </pluginManagement> </build> -  -  -  - <profiles> <profile> <id>reporting</id> Modified: trunk/nuiton-rss/src/site/site_fr.xml =================================================================== --- trunk/nuiton-rss/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-rss/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> Modified: trunk/nuiton-struts2/src/site/site_fr.xml =================================================================== --- trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-struts2/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -61,7 +61,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-tapestry/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,10 +3,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -59,20 +55,9 @@ </dependencies> -  -  -  - <name>Nuiton Web :: Nuiton Tapestry</name> <description>Extra classes for Tapestry based applications</description> -  -  -  - - <packaging>jar</packaging> - - <build> <plugins> <plugin> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -4,10 +4,6 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> @@ -61,19 +57,10 @@ </dependencies> - -  -  -  - <name>Nuiton Web :: Nuiton Web</name> <description>Usefull classes for web developpement.</description> <inceptionYear>2011</inceptionYear> -  -  -  - <properties>  @@ -85,10 +72,6 @@ </build> -  -  -  - <profiles>  Modified: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/nuiton-web/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -63,7 +63,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -75,7 +75,10 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",MonitoringFilter.html,TopiaFilter.html,WarLauncher.html," + scmwebeditor_skipDefaultFiles="true" + > </div> </footer> </body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/pom.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -3,14 +3,10 @@ <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4</version> + <version>4.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.web</groupId> @@ -201,16 +197,11 @@ </dependencyManagement> -  -  -  - <name>Nuiton Web</name> <description>Common ressources for web applications</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-web/</url> -  <developers> <developer> <id>fdesbois</id> @@ -254,10 +245,6 @@ </developer> </developers> -  -  -  - <packaging>pom</packaging> <properties> @@ -347,16 +334,12 @@ <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/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-20 16:56:21 UTC (rev 292) +++ trunk/src/site/site_fr.xml 2013-12-25 16:56:23 UTC (rev 293) @@ -30,7 +30,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -84,7 +84,7 @@ <footer> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/maven-site-nuiton.org.js"> </script> <div id='projectMetas' @@ -96,7 +96,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true" + > </div> </footer>

1 0

r292 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-web/src/main/java/org/nuiton/web/filter nuiton-web/src/site/apt
by tchemit＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: tchemit Date: 2013-12-20 17:56:21 +0100 (Fri, 20 Dec 2013) New Revision: 292 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/292 Log: refs #2979: Use topia 3.0-alpha > 7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -46,10 +46,10 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; import org.nuiton.config.ApplicationConfig; -import org.nuiton.topia.TopiaApplicationContextCache; -import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.TopiaApplicationContextCache; +import org.nuiton.topia.persistence.TopiaConfigurationConstants; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.web.SecurityEntityEnum; import org.nuiton.web.SecurityTopiaApplicationContext; import org.nuiton.web.SecurityTopiaPersistenceContext; @@ -93,7 +93,7 @@ } // get topia root context - config.setOption(TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); + config.setOption(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, SecurityEntityEnum.getImplementationClassesAsString()); Properties props = config.getFlatOptions(); rootContext = TopiaApplicationContextCache.getContext(props, CREATE_SECURITY_APPLICATION_CONTEXT); initSchema(rootContext); Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -36,7 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.web.struts2.interceptor.OpenTopiaTransactionInterceptor; /** Close a TopiaTransaction instance stored in the servlet context. Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2013-12-20 16:56:21 UTC (rev 292) @@ -34,10 +34,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; -import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaTransactionAware; import org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter; import com.opensymphony.xwork2.ActionInvocation; Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -24,7 +24,7 @@ */ package org.nuiton.web.filter; -import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaPersistenceContext; /** * Implementation of the {@link TypedTopiaTransactionFilter} using the Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 16:56:21 UTC (rev 292) @@ -28,10 +28,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Transaction; -import org.nuiton.topia.AbstractTopiaPersistenceContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaTransaction; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -67,7 +68,7 @@ * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied transaction was not still open (via a - * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. + * {@link TopiaApplicationContext#newPersistenceContext()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. * <p/> @@ -159,7 +160,7 @@ protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; protected TypedTopiaTransactionFilter(Class<PersistenceContext> persistenceContextType) { - if (persistenceContextType==null) { + if (persistenceContextType == null) { throw new NullPointerException("persistenceContextType can't be null"); } if (!persistenceContextType.isInterface()) { Modified: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2013-12-20 16:56:21 UTC (rev 292) @@ -14,7 +14,7 @@ package fr.ifremer.echobase.ui; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-20 00:00:38 UTC (rev 291) +++ trunk/pom.xml 2013-12-20 16:56:21 UTC (rev 292) @@ -272,7 +272,7 @@ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-7</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r291 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: tchemit Date: 2013-12-20 01:00:38 +0100 (Fri, 20 Dec 2013) New Revision: 291 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/291 Log: fixes #2975: Add a new filter to deal with typed persistence context Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-12 10:41:25 UTC (rev 290) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) @@ -24,381 +24,19 @@ */ package org.nuiton.web.filter; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.Transaction; -import org.nuiton.topia.AbstractTopiaPersistenceContext; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaPersistenceContext; -import org.nuiton.topia.TopiaTransaction; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - /** - * <h2>Purpose of this filter</h2> - * This filter purpose is to inject in the request a transaction from - * {@link org.nuiton.topia.TopiaPersistenceContext} and deal with the complete lifecycle of a topia - * transaction while a request. - * <p/> - * The injected transaction will be closed (if was really opened) at the end of - * the request. - * <h2>Configuration of the filter</h2> - * The filter accepts two configuration parameters: - * <ul> - * <li>{@code excludeMethods}: This parameters configure a set of method names - * which should never be called on the proxied transaction. - * When a such method is called on the transaction then the filter will pass in - * the hook {@link #onExcludeMethod(Object, Method, Object[])}. - * <p/> - * Default implementation of this hook is to throw an exception. - * </li> - * <li>{@code unusedMethods}: This parameters configure a set of method names - * which should be by-pass when the proxied transaction was not still open (via a - * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. - * When a such method is called on the transaction then the filter will pass in - * the hook {@link #onUnusedMethod(Object, Method, Object[])}. - * <p/> - * Default implementation of this hook is to not return null values. - * </li> - * </ul> - * <h2>Obtain the transaction</h2> - * The (proxied) transaction is pushed as an attribute in the servlet request. - * <p/> - * The attribute name is defined by field {@link #requestAttributeName} - * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be - * changed. - * <p/> - * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : - * <pre> - * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); - * </pre> - * <p/> - * If you prefer to not use this nice method, you can also do this: - * <pre> - * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); - * </pre> - * <p/> - * Or - * <pre> - * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); - * </pre> + * Implementation of the {@link TypedTopiaTransactionFilter} using the + * {@link TopiaPersistenceContext} as type. * * @author tchemit <chemit(a)codelutin.com> * @since 1.6 */ -public abstract class TopiaTransactionFilter implements Filter { +public abstract class TopiaTransactionFilter extends TypedTopiaTransactionFilter<TopiaPersistenceContext> { - public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = - "topiaTransaction"; - - public static final String[] DEFAULT_EXCLUDE_METHODS = { - "beginTransaction", - "closeContext", - "clear" - }; - - public static final String[] DEFAULT_UNUSED_METHODS = { - "toString", - "isClosed", - "closeContext", - "clear", - "equals", - "hashCode", - "finalize", - "getClass" - }; - - /** Logger. */ - private static final Log log = - LogFactory.getLog(TopiaTransactionFilter.class); - - /** names of methods to forbid access while using proxy. */ - protected Set<String> excludeMethods; - - /** names of methods to by-pass if no transaction opened on proxy. */ - protected Set<String> unusedMethods; - - /** - * Name of the request attribute where to push the transaction. - * <p/> - * By default will use value of - * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. - * - * @since 1.10 - */ - protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; - - public Set<String> getExcludeMethods() { - return excludeMethods; + public TopiaTransactionFilter() { + super(TopiaPersistenceContext.class); } - public Set<String> getUnusedMethods() { - return unusedMethods; - } - - /** - * to change the {@link #requestAttributeName}. - * - * @param requestAttributeName new name of the request attribute - * where to push the transaction. - * @since 1.10 - */ - public void setRequestAttributeName(String requestAttributeName) { - this.requestAttributeName = requestAttributeName; - } - - public static TopiaPersistenceContext getTransaction(ServletRequest request) { - TopiaPersistenceContext topiaContext = (TopiaPersistenceContext) - request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); - return topiaContext; - } - - /** - * Method to open a new transaction. - * - * @param request incoming request - * @return the new freshly opened transaction - * @throws TopiaException if any problem while opening a new transaction - */ - protected abstract TopiaPersistenceContext beginTransaction(ServletRequest request) throws TopiaException; - - @Override - public void destroy() { - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - String methodsFromConfig; - - methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); - String[] methods; - if (StringUtils.isNotEmpty(methodsFromConfig)) { - methods = methodsFromConfig.split(","); - } else { - methods = DEFAULT_EXCLUDE_METHODS; - } - excludeMethods = new HashSet<String>(Arrays.asList(methods)); - - methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); - if (StringUtils.isNotEmpty(methodsFromConfig)) { - methods = methodsFromConfig.split(","); - } else { - methods = DEFAULT_UNUSED_METHODS; - } - unusedMethods = new HashSet<String>(Arrays.asList(methods)); - } - - @Override - public void doFilter(ServletRequest request, - ServletResponse response, - FilterChain chain) throws IOException, ServletException { - - // creates a proxy of a lazy transaction - - TopiaTransactionProxyInvocationHandler proxyInvocationHandler = - new TopiaTransactionProxyInvocationHandler(request); - - TopiaPersistenceContext proxy = (TopiaPersistenceContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaPersistenceContext.class, - TopiaTransaction.class}, - proxyInvocationHandler - ); - - // push it in request as an attribute - request.setAttribute(requestAttributeName, proxy); - try { - - // chain to next filter - chain.doFilter(request, response); - } finally { - - // close the real transaction - onCloseTransaction(proxyInvocationHandler.transaction); - } - } - - /** - * Hook method called when a method with his name in - * {@link #excludeMethods} was invoked on the proxied transaction. - * - * @param proxy proxied transaction - * @param method method invoked - * @param args arguments of the invoked method - * @return the return code of the method - * @throws Throwable if any error to do. - */ - protected Object onExcludeMethod(Object proxy, - Method method, - Object[] args) throws Throwable { - - // not authorized - throw new IllegalAccessException( - "Not allowed to access method " + method.getName() + " on " + - proxy); - } - - /** - * Hook method to close the topia transaction of the request at the end of - * the request when all filter has been consumed. - * - * @param transaction the transaction to close (can be null if transaction - * was not required while the current request) - * @since 1.9.1 - */ - protected void onCloseTransaction(TopiaPersistenceContext transaction) { - if (transaction == null) { - if (log.isTraceEnabled()) { - log.trace("no transaction to close"); - } - } else if (transaction.isClosed()) { - if (log.isTraceEnabled()) { - log.trace("transaction " + transaction + " is already closed"); - } - } else { - if (log.isDebugEnabled()) { - log.debug("closing transaction " + transaction); - } - // let's rollback transaction if the transaction was not rollbacked nor committed - // as the topia context close context does not affect hibernate transaction - // so if something bad happen then we will always have a - Transaction tx = ((AbstractTopiaPersistenceContext) transaction).getHibernateSupport().getHibernateSession().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); - } - transaction.closeContext(); - } - } - - /** - * Hook method called when a method with his name in - * {@link #unusedMethods} was invoked on the proxied transaction - * while the underlying transaction is still not opened. - * - * @param proxy the proxy itself - * @param method method invoked - * @param args arguments of the invoked method - * @return the return code of the method - * @throws Throwable if any error to do. - */ - protected Object onUnusedMethod(Object proxy, - Method method, - Object[] args) throws Throwable { - - // by-pass method since no transaction found - - String methodName = method.getName(); - if (log.isDebugEnabled()) { - log.debug("Skip execution of method " + methodName + - " since no transaction is instanciated."); - } - - Set<String> methods = getUnusedMethods(); - if (methods.contains("toString")) { - - return "No transaction opened yet for this proxy"; - } - - if (methods.contains("isClosed")) { - - return false; - } - - if (methods.contains("equals")) { - - return false; - } - - if (methods.contains("hashCode")) { - - return 0; - } - - if (methods.contains("getClass")) { - - return TopiaPersistenceContext.class; - } - - return null; - } - - /** - * Handler of a proxy on a {@link TopiaPersistenceContext}. - * - * @see #excludeMethods - */ - public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { - - /** Incoming request that creates this handler. */ - protected final ServletRequest request; - - /** Target to use for the proxy. */ - protected TopiaPersistenceContext transaction; - - protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { - this.request = request; - } - - @Override - public Object invoke(Object proxy, - Method method, - Object[] args) throws Throwable { - - String methodName = method.getName(); - - if (getExcludeMethods().contains(methodName)) { - - Object result = onExcludeMethod(proxy, method, args); - return result; - } - - if (transaction == null) { - - if (log.isTraceEnabled()) { - log.trace("transaction started due to a call to " + methodName); - } - - if (getUnusedMethods().contains(methodName)) { - - Object result = onUnusedMethod(proxy, method, args); - return result; - } - - // first time transaction is required, create its - transaction = beginTransaction(request); - - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - } - - // can invoke the method on the transaction - try { - Object result = method.invoke(transaction, args); - return result; - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error("Could not execute method " + method.getName(), eee); - } - throw eee; - } - } - } - } Copied: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java (from rev 290, trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java) =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TypedTopiaTransactionFilter.java 2013-12-20 00:00:38 UTC (rev 291) @@ -0,0 +1,425 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.filter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; +import org.nuiton.topia.AbstractTopiaPersistenceContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaPersistenceContext; +import org.nuiton.topia.TopiaTransaction; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a transaction from + * {@link TopiaPersistenceContext} and deal with the complete lifecycle of a topia + * transaction while a request. + * <p/> + * The injected transaction will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied transaction. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied transaction was not still open (via a + * {@link org.nuiton.topia.AbstractTopiaApplicationContext#newPersistenceContext()} ()}. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the transaction</h2> + * The (proxied) transaction is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is defined by field {@link #requestAttributeName} + * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. + * <p/> + * A convience method is created here to obtain the transaction {@link #getPersistenceContext(ServletRequest)} : + * <pre> + * PersistenceContext tx = TypedTopiaTransactionFilter.getPersistenceContext(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * PersistenceContext tx = (PersistenceContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * <p/> + * Or + * <pre> + * PersistenceContext tx = (PersistenceContext) request.getAttribute(modifiedAttributeName); + * </pre> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.15 + */ +public abstract class TypedTopiaTransactionFilter<PersistenceContext extends TopiaPersistenceContext> implements Filter { + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = + "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isClosed", + "closeContext", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TypedTopiaTransactionFilter.class); + + public static <PersistenceContext extends TopiaPersistenceContext> PersistenceContext getPersistenceContext(ServletRequest request) { + PersistenceContext topiaContext = (PersistenceContext) + request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + return topiaContext; + } + + /** + * @deprecated since 1.16, use now {@link #getPersistenceContext(ServletRequest)} + */ + @Deprecated + public static <PersistenceContext extends TopiaPersistenceContext> PersistenceContext getTransaction(ServletRequest request) { + PersistenceContext topiaContext = getPersistenceContext(request); + return topiaContext; + } + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no transaction opened on proxy. */ + protected Set<String> unusedMethods; + + protected final Class<PersistenceContext> persistenceContextType; + + /** + * Name of the request attribute where to push the transaction. + * <p/> + * By default will use value of + * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * + * @since 1.10 + */ + protected String requestAttributeName = TOPIA_TRANSACTION_REQUEST_ATTRIBUTE; + + protected TypedTopiaTransactionFilter(Class<PersistenceContext> persistenceContextType) { + if (persistenceContextType==null) { + throw new NullPointerException("persistenceContextType can't be null"); + } + if (!persistenceContextType.isInterface()) { + throw new IllegalArgumentException("persistenceContextType must be an interface"); + } + this.persistenceContextType = persistenceContextType; + } + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + /** + * to change the {@link #requestAttributeName}. + * + * @param requestAttributeName new name of the request attribute + * where to push the transaction. + * @since 1.10 + */ + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; + } + + /** + * Method to open a new transaction. + * + * @param request incoming request + * @return the new freshly opened transaction + * @throws TopiaException if any problem while opening a new transaction + */ + protected abstract PersistenceContext beginTransaction(ServletRequest request) throws TopiaException; + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(request); + + PersistenceContext proxy = (PersistenceContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{persistenceContextType, + TopiaTransaction.class}, + proxyInvocationHandler + ); + + // push it in request as an attribute + request.setAttribute(requestAttributeName, proxy); + try { + + // chain to next filter + chain.doFilter(request, response); + } finally { + + // close the real transaction + onCloseTransaction(proxyInvocationHandler.transaction); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied transaction. + * + * @param proxy proxied transaction + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(PersistenceContext transaction) { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + // let's rollback transaction if the transaction was not rollbacked nor committed + // as the topia context close context does not affect hibernate transaction + // so if something bad happen then we will always have a + Transaction tx = ((AbstractTopiaPersistenceContext) transaction).getHibernateSupport().getHibernateSession().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } + transaction.closeContext(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied transaction + * while the underlying transaction is still not opened. + * + * @param proxy the proxy itself + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no transaction found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no transaction is instanciated."); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No transaction opened yet for this proxy"; + } + + if (methods.contains("isClosed")) { + + return false; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return persistenceContextType; + } + + return null; + } + + /** + * Handler of a proxy on a {@link TopiaPersistenceContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + + /** Target to use for the proxy. */ + protected PersistenceContext transaction; + + protected TopiaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time transaction is required, create its + transaction = beginTransaction(request); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } + +}

1 0

[ANN] - Nuiton Web 1.15-alpha-1 released
by nuiton.org Release Notification 12 Dec '13

12 Dec '13

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-1 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: New features: o Let nuiton-web be ToPIA 3.0 compliant Issue: 2936. Thanks to Arnaud Thimel. Resolved by athimel. Changes: o Update to Struts 2.3.16 Issue: 2963. Thanks to Arnaud Thimel. Resolved by athimel. o Update to Nuiton-utils 3.0-alpha-1 Issue: 2962. Thanks to Arnaud Thimel. Resolved by athimel. o Update to Mavenpom 4.4 Issue: 2961. Thanks to Arnaud Thimel. Resolved by athimel. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-1-deps.zip - http://nuiton.org/attachments/download/978 * nuiton-rss-1.15-alpha-1-full.zip - http://nuiton.org/attachments/download/979 * nuiton-web-1.15-alpha-1-deps.zip - http://nuiton.org/attachments/download/980 * nuiton-web-1.15-alpha-1-full.zip - http://nuiton.org/attachments/download/981 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r290 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:25 +0100 (Thu, 12 Dec 2013) New Revision: 290 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/290 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:41:19 UTC (rev 289) +++ trunk/pom.xml 2013-12-12 10:41:25 UTC (rev 290) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-1</version> + <version>1.15-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -352,11 +352,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r289 - in tags: . nuiton-web-1.15-alpha-1
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:19 +0100 (Thu, 12 Dec 2013) New Revision: 289 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/289 Log: [maven-release-plugin] copy for tag nuiton-web-1.15-alpha-1 Added: tags/nuiton-web-1.15-alpha-1/ Property changes on: tags/nuiton-web-1.15-alpha-1 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r288 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 11:41:15 +0100 (Thu, 12 Dec 2013) New Revision: 288 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/288 Log: [maven-release-plugin] prepare release nuiton-web-1.15-alpha-1 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?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> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -22,8 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> @@ -34,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,13 +1,12 @@ <?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> <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?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> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?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> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,7 +1,6 @@ <?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> @@ -12,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:39:56 UTC (rev 287) +++ trunk/pom.xml 2013-12-12 10:41:15 UTC (rev 288) @@ -1,6 +1,5 @@ <?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> @@ -16,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-1</version> <modules> <module>nuiton-web</module> @@ -353,11 +352,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-1 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r287 - trunk/nuiton-security
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:39:56 +0100 (Thu, 12 Dec 2013) New Revision: 287 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/287 Log: Add missing SVN properties Modified: trunk/nuiton-security/pom.xml Property changes on: trunk/nuiton-security/pom.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r286 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 11:39:25 +0100 (Thu, 12 Dec 2013) New Revision: 286 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/286 Log: Fix some invalid POM indentation Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-gwt/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?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> @@ -22,7 +23,6 @@ <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> </dependency> - </dependencies> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-rss/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -22,7 +22,8 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-security/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,15 +1,16 @@ <?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> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.15-SNAPSHOT</version> + </parent> - <artifactId>nuiton-security</artifactId> + <artifactId>nuiton-security</artifactId> <properties> @@ -17,108 +18,108 @@ <skipPostRelease>false</skipPostRelease> </properties> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + </dependencies> - <name>Nuiton Web :: Nuiton Security</name> - <description>Security module based on ToPIA</description> + <name>Nuiton Web :: Nuiton Security</name> + <description>Security module based on ToPIA</description> - <packaging>jar</packaging> + <packaging>jar</packaging> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <executions> - <execution> - <id>eugene-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs>zargo</inputs> - <fullPackagePath>org.nuiton.web</fullPackagePath> - <defaultPackage>org.nuiton.web</defaultPackage> - <templates>org.nuiton.topia.templates.TopiaMetaTransformer</templates> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-templates</artifactId> - <version>${topiaVersion}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserValidation</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <executions> + <execution> + <id>eugene-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs>zargo</inputs> + <fullPackagePath>org.nuiton.web</fullPackagePath> + <defaultPackage>org.nuiton.web</defaultPackage> + <templates>org.nuiton.topia.templates.TopiaMetaTransformer</templates> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-struts2/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?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> @@ -17,7 +18,7 @@ <name>Nuiton Web :: Nuiton Struts 2</name> <description>Extra classes for Struts 2 based applications</description> - + <dependencies> <dependency> @@ -51,13 +52,13 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> </dependency> <dependency> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-tapestry/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?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> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/nuiton-web/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,6 +1,7 @@ <?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> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 10:36:02 UTC (rev 285) +++ trunk/pom.xml 2013-12-12 10:39:25 UTC (rev 286) @@ -1,5 +1,6 @@ <?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> @@ -110,10 +111,10 @@ </dependency> <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.2</version> - <scope>provided</scope> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.2</version> + <scope>provided</scope> </dependency>  @@ -184,7 +185,7 @@ </exclusion> </exclusions> </dependency> - +  <dependency> <groupId>org.apache.shiro</groupId>

1 0