[jspwiki] branch master updated: update jetty to 9.4.35.v20201120 - should close #27

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 80951d9  update jetty to 9.4.35.v20201120 - should close #27
80951d9 is described below

commit 80951d90700a534f368e10bf573e6661dc8504b7
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Fri Jan 1 23:11:03 2021 +0100

    update jetty to 9.4.35.v20201120 - should close #27
---
 jspwiki-main/pom.xml                               |  1 +
 .../java/org/apache/wiki/web/TestContainer.java    | 46 ++++++++++------------
 pom.xml                                            |  3 +-
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/jspwiki-main/pom.xml b/jspwiki-main/pom.xml
index 05afad5..49a610c 100644
--- a/jspwiki-main/pom.xml
+++ b/jspwiki-main/pom.xml
@@ -204,6 +204,7 @@
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all</artifactId>
       <scope>test</scope>
+         <type>pom</type>
     </dependency>
 
     <dependency>
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java 
b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
index b8f595d..4ef7882 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
@@ -18,19 +18,6 @@
  */
 package org.apache.wiki.web;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.apache.wiki.HsqlDbUtils;
 import org.apache.wiki.auth.Users;
@@ -40,16 +27,25 @@ import org.eclipse.jetty.plus.jndi.Resource;
 import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.security.HashLoginService;
 import org.eclipse.jetty.security.SecurityHandler;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.security.UserStore;
+import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.*;
 import org.eclipse.jetty.util.security.Password;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.hsqldb.jdbc.JDBCDataSource;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
 
 /**
  * Lightweight wrapper that starts and stops an embedded Jetty server on a
@@ -239,10 +235,10 @@ public class TestContainer
         server.setStopAtShutdown( true );
         
         // Create HTTP listener
-        final SocketConnector connector = new SocketConnector();
+        final NetworkTrafficServerConnector connector = new 
NetworkTrafficServerConnector( server );
         connector.setHost( "localhost" );
         connector.setPort( HTTP_PORT );
-        connector.setMaxIdleTime( 60000 );
+        connector.setIdleTimeout( 60_000 );
 
         server.setConnectors( new Connector[] {connector} );
         log.info( "added HTTP listener for port " + HTTP_PORT );
@@ -260,12 +256,13 @@ public class TestContainer
      * @param path the file path for the WAR file, or expanded WAR directory
      * @throws IOException
      */
-    public void addWebApp(final String context, final String path ) throws 
IOException
-    {
+    public void addWebApp( final String context, final String path ) {
         // Set the default users and roles for the realm (note that realm name 
*must* match web.xml <realm-name>
+        final UserStore userStore = new UserStore();
+        userStore.addUser( Users.ADMIN, new Password(Users.ADMIN_PASS), new 
String[] {"Authenticated", "Admin"} );
+        userStore.addUser( Users.JANNE, new Password(Users.JANNE_PASS), new 
String[] {"Authenticated"} );
         final HashLoginService loginService = new HashLoginService( 
"JSPWikiRealm" );
-        loginService.putUser( Users.ADMIN, new Password(Users.ADMIN_PASS), new 
String[] {"Authenticated", "Admin"} );
-        loginService.putUser( Users.JANNE, new Password(Users.JANNE_PASS), new 
String[] {"Authenticated"} );
+        loginService.setUserStore( userStore );
 
         final WebAppContext webAppContext = new WebAppContext(path, context);
 
@@ -276,7 +273,6 @@ public class TestContainer
 
         log.error( "Adding webapp " + context + " for path " + path );
         handlerCollection.addHandler( webAppContext );
-
     }
 
     /**
diff --git a/pom.xml b/pom.xml
index a5d9685..721e5a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <javax-jsp-api.version>2.3.3</javax-jsp-api.version>
     <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
     <jdom2.version>2.0.6</jdom2.version>
-    <jetty.version>8.1.15.v20140411</jetty.version>
+    <jetty.version>9.4.35.v20201120</jetty.version>
     <jrcs-diff.version>0.4.2</jrcs-diff.version>
     <junit.version>5.7.0</junit.version>
     <log4j.version>1.2.17</log4j.version>
@@ -348,6 +348,7 @@
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-all</artifactId>
         <version>${jetty.version}</version>
+               <type>pom</type>
       </dependency>
 
       <dependency>