Author: tchemit Date: 2011-01-26 17:13:34 +0100 (Wed, 26 Jan 2011) New Revision: 2066 Url: http://nuiton.org/repositories/revision/nuiton-utils/2066 Log: Evolution #1252: Remove war package deprecated in 2.0 Removed: trunk/nuiton-utils/src/main/java/org/nuiton/util/war/ trunk/nuiton-utils/src/site/apt/Warlauncher.apt Modified: trunk/nuiton-utils/pom.xml trunk/nuiton-utils/src/license/THIRD-PARTY.properties trunk/nuiton-utils/src/site/apt/nuitonUtil.apt trunk/nuiton-utils/src/site/site_fr.xml trunk/pom.xml Modified: trunk/nuiton-utils/pom.xml =================================================================== --- trunk/nuiton-utils/pom.xml 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/nuiton-utils/pom.xml 2011-01-26 16:13:34 UTC (rev 2066) @@ -71,21 +71,7 @@ <scope>test</scope> </dependency> - <!-- Dependency for WarLauncher deprecated since 2.0, will be removed in 2.1 --> <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - - <!-- Dependency for WarLauncher deprecated since 2.0, will be removed in 2.1 --> - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>provided</scope> Modified: trunk/nuiton-utils/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-utils/src/license/THIRD-PARTY.properties 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/nuiton-utils/src/license/THIRD-PARTY.properties 2011-01-26 16:13:34 UTC (rev 2066) @@ -1,19 +1,13 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache Software License - Version 2.0 # - BSD License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - Eclipse Public License - Version 1.0 -# - GNU Lesser General Public License version 2.1 # - Lesser General Public License (LGPL) v 3.0 -# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 19 08:49:07 CET 2010 +#Wed Jan 26 17:11:25 CET 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5--jar=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Deleted: trunk/nuiton-utils/src/site/apt/Warlauncher.apt =================================================================== --- trunk/nuiton-utils/src/site/apt/Warlauncher.apt 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/nuiton-utils/src/site/apt/Warlauncher.apt 2011-01-26 16:13:34 UTC (rev 2066) @@ -1,175 +0,0 @@ - ------ - War launcher - ------ - -~~~ -~~ #%L -~~ Nuiton Utils -~~ -~~ $Id$ -~~ $HeadURL$ -~~ %% -~~ Copyright (C) 2004 - 2010 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% -~~~ - - -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). - -* Use Winstone war launcher - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</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-beta-1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</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}} - -* Jetty based - -** Maven configuration - - Add following dependencies to your project. - ------------------------------------------------- -<dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.3</version> - <scope>provided</scope> -</dependency> -<dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</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-beta-1</version> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <type>jar</type> - </overlay> - <overlay> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> -</plugin> --------------------------------------------------------------------- Modified: trunk/nuiton-utils/src/site/apt/nuitonUtil.apt =================================================================== --- trunk/nuiton-utils/src/site/apt/nuitonUtil.apt 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/nuiton-utils/src/site/apt/nuitonUtil.apt 2011-01-26 16:13:34 UTC (rev 2066) @@ -285,7 +285,7 @@ MD5 dans un flux. -** DateUtils //(since 1.1.2)// +** DateUtil //(since 1.1.2)// Boîte à outils sur les dates (plus spécialisé que org.apache.commons.lang.DateUils) Modified: trunk/nuiton-utils/src/site/site_fr.xml =================================================================== --- trunk/nuiton-utils/src/site/site_fr.xml 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/nuiton-utils/src/site/site_fr.xml 2011-01-26 16:13:34 UTC (rev 2066) @@ -43,7 +43,6 @@ <item name="Accueil" href="index.html"/> <item name="Documentation" href="/nuitonUtil.html"/> <item name="Application config" href="/ApplicationConfig.html"/> - <item name="War launcher" href="/Warlauncher.html"/> </menu> <menu name="Téléchargement"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 12:14:45 UTC (rev 2065) +++ trunk/pom.xml 2011-01-26 16:13:34 UTC (rev 2066) @@ -55,32 +55,12 @@ <version>${nuitonI18nVersion}</version> </dependency> - <!-- Dependency for WarLauncher deprecated since 2.0, will be removed in 2.1 --> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-24</version> - </dependency> - - <!-- Dependency for WarLauncher deprecated since 2.0, will be removed in 2.1 --> - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> - </dependency> - <!-- xworks dependencies --> <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${xworkVersion}</version> - <exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - </exclusions> </dependency> <dependency>