- Nuiton-utils-commits - mailman.cloud.codelutin.com

r1725 - in tags: . nuiton-utils-1.1.2
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:35 +0100 (Wed, 23 Dec 2009) New Revision: 1725 Added: tags/nuiton-utils-1.1.2/ Log: [maven-scm] copy for tag nuiton-utils-1.1.2 Property changes on: tags/nuiton-utils-1.1.2 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1724 - trunk
by fdesbois＠users.nuiton.org 23 Dec '09

23 Dec '09

Author: fdesbois Date: 2009-12-23 14:20:30 +0100 (Wed, 23 Dec 2009) New Revision: 1724 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-utils-1.1.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-21 15:28:44 UTC (rev 1723) +++ trunk/pom.xml 2009-12-23 13:20:30 UTC (rev 1724) @@ -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> @@ -15,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> <dependencies> @@ -155,9 +154,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1723 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 21 Dec '09

21 Dec '09

Author: echatellier Date: 2009-12-21 16:28:44 +0100 (Mon, 21 Dec 2009) New Revision: 1723 Modified: trunk/src/main/java/org/nuiton/util/package.html Log: Fix title Modified: trunk/src/main/java/org/nuiton/util/package.html =================================================================== --- trunk/src/main/java/org/nuiton/util/package.html 2009-12-19 15:30:53 UTC (rev 1722) +++ trunk/src/main/java/org/nuiton/util/package.html 2009-12-21 15:28:44 UTC (rev 1723) @@ -1,6 +1,6 @@ <html> <body> - <h1>Lutin util</h1> + <h1>Nuiton-utils</h1> Ensemble de classe Java permettant de simplifier le développement en factorisant des besoins que l'on retrouve dans tous les développement. On y trouve de fontion de travail sur les chaînes de caractères. Des

1 0

r1722 - trunk
by tchemit＠users.nuiton.org 19 Dec '09

19 Dec '09

Author: tchemit Date: 2009-12-19 16:30:53 +0100 (Sat, 19 Dec 2009) New Revision: 1722 Modified: trunk/pom.xml Log: use i18n 1.0.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 13:36:15 UTC (rev 1721) +++ trunk/pom.xml 2009-12-19 15:30:53 UTC (rev 1722) @@ -103,7 +103,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1721 - trunk
by tchemit＠users.nuiton.org 18 Dec '09

18 Dec '09

Author: tchemit Date: 2009-12-18 14:36:15 +0100 (Fri, 18 Dec 2009) New Revision: 1721 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-17 16:50:05 UTC (rev 1720) +++ trunk/pom.xml 2009-12-18 13:36:15 UTC (rev 1721) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1720 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:50:05 +0100 (Thu, 17 Dec 2009) New Revision: 1720 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Revert from previous change : keep old config emplacment for user : $HOME/.[filename]. Will be done for a future version. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:36:57 UTC (rev 1719) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:50:05 UTC (rev 1720) @@ -274,12 +274,10 @@ /** file /etc/[filename] */ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ - @Deprecated - String userPath1 = getUserHome() + File.separator + "."; + //@Deprecated + String userPath = getUserHome() + File.separator + "."; /** file $user.home/.local/[filename] */ - String userPath2 = getUserHome() + File.separator + ".config" + File.separator; - //String userPath = getUserHome() + File.separator + ".local" + - // /*File.separator + "share" + File.separator + "applications" + */File.separator; + //String userPath2 = getUserHome() + File.separator + ".config" + File.separator; /** vrai si on est en train de parser les options de la ligne de commande */ protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); @@ -470,7 +468,7 @@ * @param excludeKeys optional list of keys to exclude from */ public void saveForUser(String... excludeKeys) { - File file = new File(userPath2 + getConfigFileName()); + File file = new File(userPath + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -967,16 +965,20 @@ etcfile.load(etcConfig.toURI().toURL().openStream()); } - File homeConfig1 = new File(userPath1 + filename); - File homeConfig2 = new File(userPath2 + filename); - if (!homeConfig2.exists() && homeConfig1.exists()) { - log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); - homeConfig1.renameTo(homeConfig2); + File homeConfig = new File(userPath + filename); + if (homeConfig.exists()) { + log.info("Chargement du fichier de config: " + homeConfig); + homefile.load(homeConfig.toURI().toURL().openStream()); } - if (homeConfig2.exists()) { - log.info("Chargement du fichier de config: " + homeConfig2); - homefile.load(homeConfig2.toURI().toURL().openStream()); - } +// File homeConfig2 = new File(userPath2 + filename); +// if (!homeConfig2.exists() && homeConfig1.exists()) { +// log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); +// homeConfig1.renameTo(homeConfig2); +// } +// if (homeConfig2.exists()) { +// log.info("Chargement du fichier de config: " + homeConfig2); +// homefile.load(homeConfig2.toURI().toURL().openStream()); +// } // file $CURDIR/filename File config = new File(filename);

1 0

r1719 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:36:57 +0100 (Thu, 17 Dec 2009) New Revision: 1719 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Evol #161 : Change default folder for user configuration. Move previous file config. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:35:54 UTC (rev 1718) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-17 16:36:57 UTC (rev 1719) @@ -274,10 +274,12 @@ /** file /etc/[filename] */ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ - //String userPath = getUserHome() + File.separator + "."; + @Deprecated + String userPath1 = getUserHome() + File.separator + "."; /** file $user.home/.local/[filename] */ - String userPath = getUserHome() + File.separator + ".local" + - /*File.separator + "share" + File.separator + "applications" + */File.separator; + String userPath2 = getUserHome() + File.separator + ".config" + File.separator; + //String userPath = getUserHome() + File.separator + ".local" + + // /*File.separator + "share" + File.separator + "applications" + */File.separator; /** vrai si on est en train de parser les options de la ligne de commande */ protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); @@ -468,7 +470,7 @@ * @param excludeKeys optional list of keys to exclude from */ public void saveForUser(String... excludeKeys) { - File file = new File(userPath + getConfigFileName()); + File file = new File(userPath2 + getConfigFileName()); try { save(file, false, excludeKeys); } catch (IOException eee) { @@ -965,11 +967,16 @@ etcfile.load(etcConfig.toURI().toURL().openStream()); } - File homeConfig = new File(userPath + filename); - if (homeConfig.exists()) { - log.info("Chargement du fichier de config: " + homeConfig); - homefile.load(homeConfig.toURI().toURL().openStream()); + File homeConfig1 = new File(userPath1 + filename); + File homeConfig2 = new File(userPath2 + filename); + if (!homeConfig2.exists() && homeConfig1.exists()) { + log.info("Déplacement de l'ancien fichier de config: " + homeConfig1); + homeConfig1.renameTo(homeConfig2); } + if (homeConfig2.exists()) { + log.info("Chargement du fichier de config: " + homeConfig2); + homefile.load(homeConfig2.toURI().toURL().openStream()); + } // file $CURDIR/filename File config = new File(filename);

1 0

r1718 - trunk/src/site/apt
by fdesbois＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: fdesbois Date: 2009-12-17 17:35:54 +0100 (Thu, 17 Dec 2009) New Revision: 1718 Modified: trunk/src/site/apt/nuitonUtil.apt Log: Add ref in maven-site for DateUtils and PeriodDates Modified: trunk/src/site/apt/nuitonUtil.apt =================================================================== --- trunk/src/site/apt/nuitonUtil.apt 2009-12-17 15:44:25 UTC (rev 1717) +++ trunk/src/site/apt/nuitonUtil.apt 2009-12-17 16:35:54 UTC (rev 1718) @@ -312,3 +312,11 @@ ** MD5InputStream MD5 dans un flux. + +** DateUtils (since 1.1.2) + + Boîte à outils sur les dates (plus spécialisé que org.apache.commons.lang.DateUils) + +** PeriodDates (since 1.1.2) + + Objet correspondant à une période entre deux dates avec contraintes et méthodes utilitaires.

1 0

r1717 - trunk/src/site/apt
by echatellier＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: echatellier Date: 2009-12-17 16:44:25 +0100 (Thu, 17 Dec 2009) New Revision: 1717 Modified: trunk/src/site/apt/Warlauncher.apt Log: Fix doc Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2009-12-17 15:34:04 UTC (rev 1716) +++ trunk/src/site/apt/Warlauncher.apt 2009-12-17 15:44:25 UTC (rev 1717) @@ -14,8 +14,8 @@ * Prerequisites - By default, winstone look for an icon named <<favicon.png>> or <<favicon.jpg>>. - Il none of this icon is found, system tray won't work. + By default, both jetty and winstone look for an icon named <<favicon.png>> or + <<favicon.jpg>>. If none of this icons is found, system tray won't work. * Use Winstone war launcher

1 0

r1716 - in trunk: . src/main/java/org/nuiton/util/war src/site/apt
by echatellier＠users.nuiton.org 17 Dec '09

17 Dec '09

Author: echatellier Date: 2009-12-17 16:34:04 +0100 (Thu, 17 Dec 2009) New Revision: 1716 Added: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java trunk/src/site/apt/Warlauncher.apt Log: Add jetty implementation. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-17 14:10:00 UTC (rev 1715) +++ trunk/pom.xml 2009-12-17 15:34:04 UTC (rev 1716) @@ -64,6 +64,13 @@ </dependency> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> <version>0.9.10-hudson-16</version> @@ -71,11 +78,12 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.0.1.v20091125</version> + <scope>provided</scope> </dependency> + </dependencies> Added: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java =================================================================== --- trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java 2009-12-17 15:34:04 UTC (rev 1716) @@ -0,0 +1,256 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.nuiton.util.war; + +import java.awt.AWTException; +import java.awt.Desktop; +import java.awt.Image; +import java.awt.MenuItem; +import java.awt.PopupMenu; +import java.awt.SystemTray; +import java.awt.TrayIcon; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.io.File; +import java.io.IOException; +import java.net.JarURLConnection; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.swing.ImageIcon; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; + +/** + * War main class launcher (jetty based). + * + * To use it : + * java -jar app-xxx.war + * + * @author chatellier + * @version $Revision$ + * @since 1.1.2 + * + * Last update : $Date$ + * By : $Author$ + */ +public class JettyLauncher implements ActionListener, MouseListener { + + /** Jetty server instance. */ + protected Server jettyServer; + + /** Server URI. */ + protected URI serverUri; + + /** Default port. */ + protected int port = 8888; + + /** + * Main method (used by war in manifest). + * + * @param args args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + JettyLauncher launcher = new JettyLauncher(); + launcher.startServer(args); + launcher.installSystemTray(); + launcher.openBrowser(); + } + + /** + * Launch servlet container. + * + * @param args args + * @throws Exception + */ + protected void startServer(String[] args) throws Exception { + System.out.println("Starting server embedded mode..."); + + String fqnLauncherFile = JettyLauncher.class.getName().replaceAll("\\.", "/") + ".class"; + System.out.println("Search for launcher class : " + fqnLauncherFile); + + URL classFile = JettyLauncher.class.getClassLoader().getResource(fqnLauncherFile); + System.out.println(" - using classFile : " + classFile); + + // strange following line seams also work for jpnl launch + File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); + System.out.println(" - using warfile file : " + me); + + jettyServer = new Server(); + + Connector connector = new SelectChannelConnector(); + connector.setPort(port); + jettyServer.setConnectors(new Connector[]{connector}); + + WebAppContext webappcontext = new WebAppContext(); + webappcontext.setContextPath("/"); + webappcontext.setWar(me.getAbsolutePath()); + + HandlerCollection handlers= new HandlerCollection(); + handlers.setHandlers(new Handler[]{webappcontext, new DefaultHandler()}); + jettyServer.setHandler(handlers); + + jettyServer.start(); + + // build server uri + try { + serverUri = new URI("http://localhost:" + port); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + + /** + * Shutdown server. + */ + protected void stopServer() { + if (jettyServer != null) { + try { + jettyServer.stop(); + } catch (Exception e) { + e.printStackTrace(); + } + System.exit(0); + } + } + + /** + * Install system tray to stop server. + */ + protected void installSystemTray() { + if (SystemTray.isSupported()) { + // build menu + PopupMenu menu = new PopupMenu(); + MenuItem browserItem = new MenuItem("Start browser"); + browserItem.addActionListener(this); + browserItem.setActionCommand("browser"); + menu.add(browserItem); + + MenuItem stopItem = new MenuItem("Stop server"); + stopItem.addActionListener(this); + stopItem.setActionCommand("stop"); + menu.add(stopItem); + + // build tray icon + URL imageURL = JettyLauncher.class.getResource("/favicon.png"); + if (imageURL == null) { + imageURL = JettyLauncher.class.getResource("/favicon.jpg"); + } + if (imageURL == null) { + System.out.println("No favicon.{png|jpg} found, skip systray installation"); + } else { + Image image = new ImageIcon(imageURL).getImage(); + TrayIcon icon = new TrayIcon(image, "Server", menu); + icon.setImageAutoSize(true); + icon.addMouseListener(this); + + // System tray + SystemTray systemTray = SystemTray.getSystemTray(); + try { + systemTray.add(icon); + } catch (AWTException ex) { + throw new RuntimeException("Can't install tray icon", ex); + } + } + } + } + + /* + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent e) { + if ("browser".equalsIgnoreCase(e.getActionCommand())) { + openBrowser(); + } else if ("stop".equalsIgnoreCase(e.getActionCommand())) { + stopServer(); + } + } + + /** + * Open browser. + * + * @throws IOException + */ + protected void openBrowser() { + if (Desktop.isDesktopSupported() && serverUri != null) { + Desktop desktop = Desktop.getDesktop(); + if (desktop.isSupported(Desktop.Action.BROWSE)) { + System.out.println("Opening browser at " + serverUri); + try { + desktop.browse(serverUri); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + /* + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + openBrowser(); + } + } + + /* + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ + @Override + public void mousePressed(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) + */ + @Override + public void mouseReleased(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) + */ + @Override + public void mouseEntered(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ + @Override + public void mouseExited(MouseEvent e) { + + } +} Property changes on: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java =================================================================== --- trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java 2009-12-17 14:10:00 UTC (rev 1715) +++ trunk/src/main/java/org/nuiton/util/war/WinstoneLauncher.java 2009-12-17 15:34:04 UTC (rev 1716) @@ -42,7 +42,7 @@ import winstone.Launcher; /** - * War main class launcher. + * War main class launcher (winstone based). * * Based on winstone micro container. * Modified: trunk/src/site/apt/Warlauncher.apt =================================================================== --- trunk/src/site/apt/Warlauncher.apt 2009-12-17 14:10:00 UTC (rev 1715) +++ trunk/src/site/apt/Warlauncher.apt 2009-12-17 15:34:04 UTC (rev 1716) @@ -4,25 +4,23 @@ War launcher -* Winstone based +* Features -** Features - * Start embedded servlet container with current webapp * Favicon support * Systray with popup menu -** Use Winstone war launcher +* Prerequisites -*** Prerequisites - By default, winstone look for an icon named <<favicon.png>> or <<favicon.jpg>>. Il none of this icon is found, system tray won't work. -*** Maven configuration +* Use Winstone war launcher +** Maven configuration + Add following dependencies to your project. ------------------------------------------------ @@ -81,4 +79,65 @@ * Jetty based - <Comming soon...> +** Maven configuration + + Add following dependencies to your project. + +------------------------------------------------ +<dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.2</version> + <scope>provided</scope> +</dependency> +<dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.0.1.v20091125</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> +--------------------------------------------------------------------

1 0