branch develop updated (238196d -> 04536ee)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git from 238196d add missing dependency + licenses new ea2c21e Update gitignore new 4bec087 fixes #3783: Remove winstone launcher (unmaintained) new c5d7a62 Fix javadoc new 306e10d Remove winstone new 04536ee fixes #3782: Update to jetty 9 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 04536eee22a85d67c42d3073c551a905768707e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 23:32:26 2015 +0100 fixes #3782: Update to jetty 9 commit 306e10d8f3d24895d1efe5ec7e2cc8f12f0bb2b1 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:51:37 2015 +0100 Remove winstone commit c5d7a62a851cb828b0cf56ad1b42b582fb69f7a4 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:49:25 2015 +0100 Fix javadoc commit 4bec08763e46b76e09c906a58c510e9a94697039 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:45:28 2015 +0100 fixes #3783: Remove winstone launcher (unmaintained) commit ea2c21e7ff21b0b001beffac701cf4df89864b4d Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:44:39 2015 +0100 Update gitignore Summary of changes: .gitignore | 5 + nuiton-rss/pom.xml | 2 +- nuiton-security/pom.xml | 2 +- nuiton-struts2/pom.xml | 2 +- .../struts2/converters/LocalNumberConverter.java | 4 +- .../web/tapestry5/components/SubmitContext.java | 2 +- .../tapestry5/services/ServiceAuthentication.java | 2 +- .../services/ServiceAuthenticationImpl.java | 2 +- nuiton-web/pom.xml | 13 +- .../nuiton/web/filter/JpaTransactionFilter.java | 2 +- .../java/org/nuiton/web/war/JettyLauncher.java | 27 +- .../java/org/nuiton/web/war/WinstoneLauncher.java | 291 --------------------- pom.xml | 20 +- 13 files changed, 33 insertions(+), 341 deletions(-) delete mode 100644 nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit ea2c21e7ff21b0b001beffac701cf4df89864b4d Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:44:39 2015 +0100 Update gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 9c102da..70c1324 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ /*/*.iws /*/*~ /*/target +.project +.settings +*/.settings +*/.project +*/.classpath -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit 4bec08763e46b76e09c906a58c510e9a94697039 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:45:28 2015 +0100 fixes #3783: Remove winstone launcher (unmaintained) --- nuiton-web/pom.xml | 7 - .../java/org/nuiton/web/war/WinstoneLauncher.java | 291 --------------------- pom.xml | 1 - 3 files changed, 299 deletions(-) diff --git a/nuiton-web/pom.xml b/nuiton-web/pom.xml index 92d027a..5cac0da 100644 --- a/nuiton-web/pom.xml +++ b/nuiton-web/pom.xml @@ -45,13 +45,6 @@ <dependencies> <!-- Dependencies for WarLaunchers --> - - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java deleted file mode 100644 index 09ff0ab..0000000 --- a/nuiton-web/src/main/java/org/nuiton/web/war/WinstoneLauncher.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Web - * %% - * Copyright (C) 2011 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% - */ -package org.nuiton.web.war; - -import winstone.Launcher; - -import javax.swing.ImageIcon; -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.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringWriter; -import java.net.JarURLConnection; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Map; - -/** - * War main class launcher (winstone based). - * - * Based on winstone micro container. - * - * To use it : - * java -jar app-xxx.war - * - * @author chatellier - * @version $Id$ - * @since 1.0 - */ -public class WinstoneLauncher implements ActionListener, MouseListener { - - /** Winstone server instance. */ - protected Launcher winstone; - - /** Server URI. */ - protected URI serverUri; - - /** Server name. */ - protected String serverName; - - /** - * Main method (used by war in manifest). - * - * @param args args - * @throws IOException - */ - public static void main(String[] args) throws IOException { - WinstoneLauncher launcher = new WinstoneLauncher(); - launcher.readInformation(); - launcher.startServer(args); - launcher.installSystemTray(); - launcher.openBrowser(); - } - - /** - * Parse WEB-INF/web.xml file and get server display name. - * - * @since 1.1.3 - */ - protected void readInformation() { - InputStream stream = WinstoneLauncher.class.getResourceAsStream("/WEB-INF/web.xml"); - - if (stream != null) { - String content = readAsString(stream); - if (content != null) { - int first = content.indexOf("<display-name>"); - if (first >= 0) { - serverName = content.substring(first + 14, content.indexOf("</display-name>")); - System.out.println("Using server name : " + serverName); - } - } - } - - // if none read, set default - if (serverName == null || serverName.isEmpty()) { - serverName = "Server"; - } - } - - /** - * Read input stream as string. - * - * Code from commons io. - * - * @param stream stream to read - * @return content as string - * @since 1.1.3 - */ - protected String readAsString(InputStream stream) { - InputStreamReader reader = new InputStreamReader(stream); - StringWriter sw = new StringWriter(); - char[] buffer = new char[4096]; - int n = 0; - try { - while (-1 != (n = reader.read(buffer))) { - sw.write(buffer, 0, n); - } - } catch (IOException e) { - e.printStackTrace(); - } - return sw.toString(); - } - - /** - * Launch servlet container. - * - * @param args args - * @throws IOException - */ - protected void startServer(String[] args) throws IOException { - System.out.println("Starting server embedded mode..."); - - String fqnLauncherFile = WinstoneLauncher.class.getName().replaceAll("\\.", "/") + ".class"; - System.out.println("Search for launcher class : " + fqnLauncherFile); - - URL classFile = WinstoneLauncher.class.getClassLoader().getResource(fqnLauncherFile); - System.out.println(" - using classFile : " + classFile); - - // strange following line seams also work for jnlp launch - File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); - System.out.println(" - using warfile file : " + me); - - // hashArgs map, initialized with command line args - Map<String, String> hashArgs = Launcher.getArgsFromCommandLine(args); - - hashArgs.put("warfile", me.getAbsolutePath()); // or any other command line args, eg port - - System.out.println(" - using args : " + hashArgs); - - Launcher.initLogger(hashArgs); - winstone = new Launcher(hashArgs); // spawns threads, so your application doesn't block - - // open browser - int port = 8080; - String configPort = hashArgs.get("httpPort"); - if (configPort != null && !configPort.isEmpty()) { - try { - port = Integer.parseInt(configPort); - } catch (NumberFormatException e) { - e.printStackTrace(); - } - } - - // build server uri - try { - serverUri = new URI("http://localhost:" + port); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - - /** - * Shutdown server. - */ - protected void stopServer() { - if (winstone != null) { - winstone.shutdown(); - 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 = WinstoneLauncher.class.getResource("/favicon.png"); - if (imageURL == null) { - imageURL = WinstoneLauncher.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, serverName, 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(); - } - } - } - } - - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - openBrowser(); - } - } - - @Override - public void mousePressed(MouseEvent e) { - - } - - @Override - public void mouseReleased(MouseEvent e) { - - } - - @Override - public void mouseEntered(MouseEvent e) { - - } - - @Override - public void mouseExited(MouseEvent e) { - - } -} diff --git a/pom.xml b/pom.xml index 2b036d4..40d007b 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,6 @@ License along with this program. If not, see <shiroVersion>1.2.2</shiroVersion> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - <windstoneVersion>0.9.10-hudson-24</windstoneVersion> <!--Multilanguage maven-site --> <locales>fr</locales> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit c5d7a62a851cb828b0cf56ad1b42b582fb69f7a4 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:49:25 2015 +0100 Fix javadoc --- .../java/org/nuiton/web/struts2/converters/LocalNumberConverter.java | 4 ++-- .../main/java/org/nuiton/web/tapestry5/components/SubmitContext.java | 2 +- .../java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java | 2 +- .../org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java | 2 +- .../src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java | 2 +- nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java | 2 -- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java index a745a87..234a0f9 100644 --- a/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java +++ b/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java @@ -55,10 +55,10 @@ import java.util.Map; */ public class LocalNumberConverter extends NumberConverter { - /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link int}s and {@link java.lang.Integer} instances */ + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@code int}s and {@link java.lang.Integer} instances */ protected DecimalFormat integerFormat; - /** {@link java.text.DecimalFormat} to use for parsing/formatting {@link double}s and {@link java.lang.Double} instances */ + /** {@link java.text.DecimalFormat} to use for parsing/formatting {@code double}s and {@link java.lang.Double} instances */ protected DecimalFormat doubleFormat; protected DecimalFormat getIntegerFormat() { diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java index a078986..eab2271 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/components/SubmitContext.java @@ -44,7 +44,7 @@ import org.apache.tapestry5.services.javascript.JavaScriptSupport; * Submit component is that this component's context is immutable and can, for * example, be set to different values within a loop. * - * @link http://wiki.apache.org/tapestry/Tapestry5SubmitContextComponent + * @see "http://wiki.apache.org/tapestry/Tapestry5SubmitContextComponent" * @deprecated was a monkey-patch for a Tapestry 5.0.4 issue. In Tapestry * 5.2, the bug remains not solved but this workaround is broken. * (your are f*cked). diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java index 123ad99..b5aae9e 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthentication.java @@ -25,7 +25,7 @@ package org.nuiton.web.tapestry5.services; * This service is used to provide authentication managment for a final * application. The user type used in the application is needed. This service * need to be implemented and build in the AppModule of your application. - * An abstract implementation is available {@link ServiceAuthenticationAbstract} + * An implementation is available {@link ServiceAuthenticationImpl} * This service is used in {@link AbstractAuthenticationFilter} to verify * user rights for displaying pages using {@link #isAllowed(Class)} method. * See documentation site for more explanation of using this service and diff --git a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java index 9d1e19c..b62657e 100644 --- a/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java +++ b/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/services/ServiceAuthenticationImpl.java @@ -33,7 +33,7 @@ import java.lang.annotation.Annotation; * managmentan depends on user type and annotation used to identify * pages that need authentication. This behavior is done in * {@link #isAllowed(Class)} that detect the annotation on the page (ex : - * {@link RequiresAuthentication} annotation) and call the method + * {@link org.nuiton.web.tapestry5.annotations.RequiresAuthentication} annotation) and call the method * {@link #checkAuthorizations(Object, Annotation)} that is implemented by * default to do nothing (return true). * <br \> diff --git a/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java b/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java index 555c60a..2712178 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java +++ b/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java @@ -61,7 +61,7 @@ import java.util.Set; * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied entityManager was not still open - * (via a {@link EntityManager#}. + * (via a {@link EntityManager}. * When a such method is called on the entityManager then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. * <p/> diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java index 161715e..6719938 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java @@ -264,8 +264,6 @@ public class JettyLauncher implements ActionListener, MouseListener { /** * Open browser. - * - * @throws IOException */ protected void openBrowser() { if (Desktop.isDesktopSupported() && serverUri != null) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit 306e10d8f3d24895d1efe5ec7e2cc8f12f0bb2b1 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 21:51:37 2015 +0100 Remove winstone --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 40d007b..8a4e2c7 100644 --- a/pom.xml +++ b/pom.xml @@ -197,13 +197,6 @@ License along with this program. If not, see </dependency> <!-- WarLaunchers --> - - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>${windstoneVersion}</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-webapp</artifactId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See http://git.nuiton.org/nuiton-web.git commit 04536eee22a85d67c42d3073c551a905768707e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 23:32:26 2015 +0100 fixes #3782: Update to jetty 9 --- nuiton-rss/pom.xml | 2 +- nuiton-security/pom.xml | 2 +- nuiton-struts2/pom.xml | 2 +- nuiton-web/pom.xml | 6 +++--- .../java/org/nuiton/web/war/JettyLauncher.java | 25 +++++++++------------- pom.xml | 12 +++++------ 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/nuiton-rss/pom.xml b/nuiton-rss/pom.xml index bea8964..c4935d2 100644 --- a/nuiton-rss/pom.xml +++ b/nuiton-rss/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> diff --git a/nuiton-security/pom.xml b/nuiton-security/pom.xml index f8c843f..eae0394 100644 --- a/nuiton-security/pom.xml +++ b/nuiton-security/pom.xml @@ -63,7 +63,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> <groupId>org.apache.shiro</groupId> diff --git a/nuiton-struts2/pom.xml b/nuiton-struts2/pom.xml index 365928f..d4bf377 100644 --- a/nuiton-struts2/pom.xml +++ b/nuiton-struts2/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> diff --git a/nuiton-web/pom.xml b/nuiton-web/pom.xml index 5cac0da..d966730 100644 --- a/nuiton-web/pom.xml +++ b/nuiton-web/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web :: Nuiton Web %% - Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit + Copyright (C) 2008 - 2015 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -46,8 +46,8 @@ <!-- Dependencies for WarLaunchers --> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> <scope>provided</scope> </dependency> diff --git a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java index 6719938..6b641a1 100644 --- a/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java +++ b/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java @@ -2,7 +2,7 @@ * #%L * Nuiton Web :: Nuiton Web * %% - * Copyright (C) 2011 CodeLutin + * Copyright (C) 2011, 2015 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 @@ -22,15 +22,6 @@ package org.nuiton.web.war; -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; - -import javax.swing.ImageIcon; import java.awt.AWTException; import java.awt.Desktop; import java.awt.Image; @@ -52,6 +43,14 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import javax.swing.ImageIcon; + +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.webapp.WebAppContext; + /** * War main class launcher (jetty based). * <p/> @@ -178,11 +177,7 @@ public class JettyLauncher implements ActionListener, MouseListener { 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}); + jettyServer = new Server(port); WebAppContext webappcontext = new WebAppContext(); webappcontext.setContextPath(contextPath); diff --git a/pom.xml b/pom.xml index 8a4e2c7..3206530 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Web %% -Copyright (C) 2008 - 2014 CodeLutin, Tony Chemit +Copyright (C) 2008 - 2015 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -143,8 +143,8 @@ License along with this program. If not, see <struts2Version>2.3.16</struts2Version> <shiroVersion>1.2.2</shiroVersion> - <servletApiVersion>2.5</servletApiVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> + <servletApiVersion>3.0.1</servletApiVersion> + <jettyVersion>9.3.6.v20151106</jettyVersion> <!--Multilanguage maven-site --> <locales>fr</locales> @@ -198,8 +198,8 @@ License along with this program. If not, see <!-- WarLaunchers --> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> <version>${jettyVersion}</version> </dependency> @@ -263,7 +263,7 @@ License along with this program. If not, see <!--Provided--> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servletApiVersion}</version> <scope>provided</scope> </dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm