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 @@ <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> - <packaging>jar</packaging> - <properties> <!-- extra files to include in release --> 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> <!-- Tapestry --> <tapestryVersion>5.2.4</tapestryVersion> @@ -236,7 +235,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion> <!-- Strust 2 --> - <struts2Version>2.2.3</struts2Version> + <struts2Version>2.2.3.1</struts2Version> <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales>