r114 - trunk/nuiton-web/src/site/apt - Nuiton-web-commits

11 Sep 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}}

    

r114 - trunk/nuiton-web/src/site/apt

echatellier＠users.nuiton.org

tags

participants (1)