September 2011 - Nuiton-web-commits - mailman.cloud.codelutin.com

r120 - trunk
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 19:27:59 +0200 (Thu, 22 Sep 2011) New Revision: 120 Url: http://nuiton.org/repositories/revision/nuiton-web/120 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 13:20:36 UTC (rev 119) +++ trunk/pom.xml 2011-09-22 17:27:59 UTC (rev 120) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r119 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 15:20:36 +0200 (Thu, 22 Sep 2011) New Revision: 119 Url: http://nuiton.org/repositories/revision/nuiton-web/119 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/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 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-gwt/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-rss/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/nuiton-web/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 13:20:35 UTC (rev 118) +++ trunk/pom.xml 2011-09-22 13:20:36 UTC (rev 119) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -298,11 +298,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.4</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-parent-1.4 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r118 - tags
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 15:20:35 +0200 (Thu, 22 Sep 2011) New Revision: 118 Url: http://nuiton.org/repositories/revision/nuiton-web/118 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.4 Added: tags/nuiton-web-parent-1.4/

1 0

r117 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: maven-release Date: 2011-09-22 15:20:33 +0200 (Thu, 22 Sep 2011) New Revision: 117 Url: http://nuiton.org/repositories/revision/nuiton-web/117 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.4 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/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 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-gwt/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-rss/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-struts2/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-tapestry/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/nuiton-web/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:57:16 UTC (rev 116) +++ trunk/pom.xml 2011-09-22 13:20:33 UTC (rev 117) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <modules> <module>nuiton-web</module> @@ -298,11 +298,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-parent-1.4</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.4 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> <distributionManagement>

1 0

r116 - in trunk: . nuiton-web/src/site/apt
by tchemit＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: tchemit Date: 2011-09-22 14:57:16 +0200 (Thu, 22 Sep 2011) New Revision: 116 Url: http://nuiton.org/repositories/revision/nuiton-web/116 Log: use properties to fill documentation by magic :) Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm trunk/pom.xml Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:33:04 UTC (rev 115) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:57:16 UTC (rev 116) @@ -64,13 +64,13 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>8.0.1.v20110908</version> + <version>${jettyVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> ------------------------------------------------ @@ -124,7 +124,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> + <version>${windstoneVersion}</version> <scope>provided</scope> </dependency> ------------------------------------------------ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:33:04 UTC (rev 115) +++ trunk/pom.xml 2011-09-22 12:57:16 UTC (rev 116) @@ -34,13 +34,13 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> + <version>${windstoneVersion}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> + <version>${jettyVersion}</version> </dependency>  @@ -104,7 +104,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.5</version> + <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> @@ -148,7 +148,7 @@ <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> - <version>2.5.0</version> + <version>3.1.0</version> </dependency> <dependency> @@ -237,6 +237,10 @@  <struts2Version>2.2.3.1</struts2Version> + <servletApiVersion>2.5</servletApiVersion> + <jettyVersion>8.0.1.v20110908</jettyVersion> + <windstoneVersion>0.9.10-hudson-24</windstoneVersion> +  <siteLocales>en,fr</siteLocales>

1 0

r115 - in trunk: . nuiton-web nuiton-web/src/site/apt
by tchemit＠users.nuiton.org Sept. 22, 2011

Sept. 22, 2011

Author: tchemit Date: 2011-09-22 14:33:04 +0200 (Thu, 22 Sep 2011) New Revision: 115 Url: http://nuiton.org/repositories/revision/nuiton-web/115 Log: T?\195?\162che #1750: Updates to Topia 2.6.2 T?\195?\162che #1749: Updates to struts 2.2.3.1 Evolution #1751: Updates war lanucher documentation Added: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm Removed: trunk/nuiton-web/src/site/apt/Warlauncher.apt Modified: trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/nuiton-web/pom.xml 2011-09-22 12:33:04 UTC (rev 115) @@ -47,8 +47,6 @@   - <packaging>jar</packaging> - <properties>  Deleted: trunk/nuiton-web/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-22 12:33:04 UTC (rev 115) @@ -1,169 +0,0 @@ -~~~ -~~ #%L -~~ Nuiton Web :: Nuiton Web -~~ -~~ $Id$ -~~ $HeadURL$ -~~ %% -~~ Copyright (C) 2011 CodeLutin, Chatellier Eric -~~ %% -~~ 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% -~~~ - ------ - War launcher - ------ - - -War launcher - -* Features - - * Start embedded servlet container with current webapp - - * Favicon support - - * Systray with popup menu - -* Prerequisites - - By default, both jetty and winstone look for an icon named <<favicon.png>> or - <<favicon.jpg>> at webapp base. If none of this icons is found, system tray - won't work. - - In maven, by default, this file must be put in <<<src/main/webapp>>> directory. - - If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, - it's used as server name (currently in systray tooltip). - -* Jetty based - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <version>1.4</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <version>8.0.1.v20110908</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> -</dependency> ------------------------------------------------- - - They have to be both at least in <<<provided>>> scope. - - Then, you need to add following configuration into maven-war-plugin : - --------------------------------------------------------------------- -<plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> -</plugin> --------------------------------------------------------------------- - -* Use Winstone war launcher - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <version>1.4</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> - <scope>provided</scope> -</dependency> ------------------------------------------------- - - They have to be both at least in <<<provided>>> scope. - - Then, you need to add following configuration into maven-war-plugin : - --------------------------------------------------------------------- -<plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> -</plugin> --------------------------------------------------------------------- - -** References - - * Winstone home : {{http://winstone.sourceforge.net}} - - * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} Copied: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm (from rev 114, trunk/nuiton-web/src/site/apt/Warlauncher.apt) =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm (rev 0) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2011-09-22 12:33:04 UTC (rev 115) @@ -0,0 +1,169 @@ +~~~ +~~ #%L +~~ Nuiton Web :: Nuiton Web +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2011 CodeLutin, Chatellier Eric +~~ %% +~~ 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% +~~~ + ------ + War launcher + ------ + + +War launcher + +* Features + + * Start embedded servlet container with current webapp + + * Favicon support + + * Systray with popup menu + +* Prerequisites + + By default, both jetty and winstone look for an icon named <<favicon.png>> or + <<favicon.jpg>> at webapp base. If none of this icons is found, system tray + won't work. + + In maven, by default, this file must be put in <<<src/main/webapp>>> directory. + + If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, + it's used as server name (currently in systray tooltip). + +* Jetty based + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>${project.version}</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>8.0.1.v20110908</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>${warPluginVersion}</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- + +* Use Winstone war launcher + +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>${project.version}</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> + <scope>provided</scope> +</dependency> +------------------------------------------------ + + They have to be both at least in <<<provided>>> scope. + + Then, you need to add following configuration into maven-war-plugin : + +-------------------------------------------------------------------- +<plugin> + <artifactId>maven-war-plugin</artifactId> + <version>${warPluginVersion}</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> +</plugin> +-------------------------------------------------------------------- + +** References + + * Winstone home : {{http://winstone.sourceforge.net}} + + * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} Property changes on: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-11 14:07:56 UTC (rev 114) +++ trunk/pom.xml 2011-09-22 12:33:04 UTC (rev 115) @@ -224,8 +224,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6.1</topiaVersion> + <topiaVersion>2.6.2</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> @@ -236,7 +235,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.2.3</struts2Version> + <struts2Version>2.2.3.1</struts2Version>  <siteLocales>en,fr</siteLocales>

1 0

r114 - trunk/nuiton-web/src/site/apt
by echatellier＠users.nuiton.org Sept. 11, 2011

Sept. 11, 2011

Author: echatellier Date: 2011-09-11 16:07:56 +0200 (Sun, 11 Sep 2011) New Revision: 114 Url: http://nuiton.org/repositories/revision/nuiton-web/114 Log: Update war launcher doc Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-09 16:05:23 UTC (rev 113) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt 2011-09-11 14:07:56 UTC (rev 114) @@ -5,7 +5,7 @@ ~~ $Id$ ~~ $HeadURL$ ~~ %% -~~ Copyright (C) 2011 CodeLutin +~~ Copyright (C) 2011 CodeLutin, Chatellier Eric ~~ %% ~~ This program is free software: you can redistribute it and/or modify ~~ it under the terms of the GNU Lesser General Public License as @@ -48,7 +48,7 @@ If <<<display-name>>> content can be read into <<<WEB-INF/web.xml>>> file, it's used as server name (currently in systray tooltip). -* Use Winstone war launcher +* Jetty based ** Maven configuration @@ -56,17 +56,23 @@ ------------------------------------------------ <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>1.4</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>8.0.1.v20110908</version> <scope>provided</scope> </dependency> +<dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> +</dependency> ------------------------------------------------ They have to be both at least in <<<provided>>> scope. @@ -76,25 +82,25 @@ -------------------------------------------------------------------- <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1.1</version> <configuration> <archive> <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> <overlays> <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> <type>jar</type> <includes> - <include>**/war/Winstone*</include> + <include>**/war/Jetty*</include> </includes> </overlay> <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> <type>jar</type> </overlay> </overlays> @@ -102,37 +108,25 @@ </plugin> -------------------------------------------------------------------- -** References +* Use Winstone war launcher - * Winstone home : {{http://winstone.sourceforge.net}} - - * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}} - -* Jetty based - ** Maven configuration Add following dependencies to your project. ------------------------------------------------ <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>1.4</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> <scope>provided</scope> </dependency> -<dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> -</dependency> ------------------------------------------------ They have to be both at least in <<<provided>>> scope. @@ -142,33 +136,34 @@ -------------------------------------------------------------------- <plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> + <version>2.1.1</version> <configuration> <archive> <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> + <mainClass>org.nuiton.web.war.WinstoneLauncher</mainClass> </manifest> </archive> <overlays> <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> <type>jar</type> <includes> - <include>**/war/Jetty*</include> + <include>**/war/Winstone*</include> </includes> </overlay> <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> <type>jar</type> </overlay> - <overlay> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </overlay> </overlays> </configuration> </plugin> -------------------------------------------------------------------- + +** References + + * Winstone home : {{http://winstone.sourceforge.net}} + + * Winstone command line options : {{http://winstone.sourceforge.net/#commandLine}}

1 0

r113 - trunk
by tchemit＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 18:05:23 +0200 (Fri, 09 Sep 2011) New Revision: 113 Url: http://nuiton.org/repositories/revision/nuiton-web/113 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 15:50:54 UTC (rev 112) +++ trunk/pom.xml 2011-09-09 16:05:23 UTC (rev 113) @@ -246,13 +246,6 @@ </properties> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <build> <pluginManagement> @@ -309,4 +302,11 @@ <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + </project>

1 0

r112 - trunk
by maven-release＠users.nuiton.org Sept. 9, 2011

Sept. 9, 2011

Author: maven-release Date: 2011-09-09 17:50:54 +0200 (Fri, 09 Sep 2011) New Revision: 112 Url: http://nuiton.org/repositories/revision/nuiton-web/112 Log: Update mavenpom4redmineAndCentral to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-23 13:02:30 UTC (rev 111) +++ trunk/pom.xml 2011-09-09 15:50:54 UTC (rev 112) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0