jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1831860 - in /jackrabbit/trunk: jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/ jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/ jackrabbit-parent/ jackrabbit-standalone/src/main/java/org/apache/jack...
Date Fri, 18 May 2018 13:33:06 GMT
Author: reschke
Date: Fri May 18 13:33:06 2018
New Revision: 1831860

URL: http://svn.apache.org/viewvc?rev=1831860&view=rev
Log:
JCR-4304: update Jetty to supported version 9.2.*

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
    jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java?rev=1831860&r1=1831859&r2=1831860&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
Fri May 18 13:33:06 2018
@@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.Text;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
@@ -51,11 +51,12 @@ public class LitmusTest extends TestCase
                     "jcr-jackrabbit://" + Text.escapePath(dir.getCanonicalPath()));
             Session session = repository.login(); // for the TransientRepository
             try {
-                SocketConnector connector = new SocketConnector();
+                Server server = new Server();
+
+                ServerConnector connector = new ServerConnector(server);
                 connector.setHost("localhost");
                 connector.setPort(Integer.getInteger("litmus.port", 0));
 
-                Server server = new Server();
                 server.addConnector(connector);
 
                 ServletHolder holder = new ServletHolder(

Modified: jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java?rev=1831860&r1=1831859&r2=1831860&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Fri May 18 13:33:06 2018
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.test.NotExe
 import org.apache.jackrabbit.test.RepositoryStubException;
 import org.apache.jackrabbit.webdav.jcr.JCRWebdavServerServlet;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
@@ -44,7 +44,7 @@ public class RepositoryStubImpl extends
 
     private static Repository repository;
 
-    private static SocketConnector connector;
+    private static ServerConnector connector;
 
     private static Server server;
 
@@ -66,17 +66,8 @@ public class RepositoryStubImpl extends
             repository = super.getRepository();
         }
 
-        if (connector == null) {
-            connector = new SocketConnector();
-            connector.setHost("localhost");
-            String pvalue = System.getProperty("org.apache.jackrabbit.jcr2dav.RepositoryStubImpl.port",
"0");
-            int port = pvalue.equals("") ? 0 : Integer.parseInt(pvalue);
-            connector.setPort(port);
-        }
-
         if (server == null) {
             server = new Server();
-            server.addConnector(connector);
 
             ServletHolder holder = new ServletHolder(new JcrRemotingServlet() {
                 protected Repository getRepository() {
@@ -89,6 +80,15 @@ public class RepositoryStubImpl extends
 
             ServletContextHandler schandler = new ServletContextHandler(server, "/");
             schandler.addServlet(holder, "/*");
+        }
+
+        if (connector == null) {
+            connector = new ServerConnector(server);
+            connector.setHost("localhost");
+            String pvalue = System.getProperty("org.apache.jackrabbit.jcr2dav.RepositoryStubImpl.port",
"0");
+            int port = pvalue.equals("") ? 0 : Integer.parseInt(pvalue);
+            connector.setPort(port);
+            server.addConnector(connector);
 
             try {
                 server.start();

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1831860&r1=1831859&r2=1831860&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Fri May 18 13:33:06 2018
@@ -46,7 +46,7 @@
     <test.opts.memory>-Xmx256m</test.opts.memory>
     <test.opts.modules />
     <test.opts>${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions</test.opts>
-    <jetty.version>8.2.0.v20160908</jetty.version>
+    <jetty.version>9.2.24.v20180105</jetty.version>
     <tika.version>1.18</tika.version>
     <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
     <slf4j.api.version>1.7.25</slf4j.api.version>

Modified: jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=1831860&r1=1831859&r2=1831860&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
(original)
+++ jackrabbit/trunk/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Fri May 18 13:33:06 2018
@@ -40,10 +40,9 @@ import org.apache.jackrabbit.servlet.jac
 import org.apache.jackrabbit.standalone.cli.CommandException;
 import org.apache.jackrabbit.standalone.cli.CommandHelper;
 import org.apache.jackrabbit.standalone.cli.JcrClient;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.NCSARequestLog;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.RequestLogHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;
@@ -68,10 +67,10 @@ public class Main {
 
     private final WebAppContext webapp = new WebAppContext();
 
-    private final Connector connector = new SocketConnector();
-
     private final Server server = new Server();
 
+    private final ServerConnector connector = new ServerConnector(server);
+
     private Main(String[] args) throws ParseException {
         options.addOption("?", "help", false, "print this message");
         options.addOption("n", "notice", false, "print copyright notices");



Mime
View raw message