jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1837371 - in /jackrabbit/branches/2.14: ./ 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/...
Date Fri, 03 Aug 2018 13:46:34 GMT
Author: reschke
Date: Fri Aug  3 13:46:34 2018
New Revision: 1837371

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

Modified:
    jackrabbit/branches/2.14/   (props changed)
    jackrabbit/branches/2.14/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
    jackrabbit/branches/2.14/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
    jackrabbit/branches/2.14/jackrabbit-parent/pom.xml
    jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java

Propchange: jackrabbit/branches/2.14/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  3 13:46:34 2018
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780335-1780336,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831854,1833374,1834008
+/jackrabbit/trunk:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780335-1780336,1780406,1785225,1786325,1786330,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831854,1831860,1833374,1834008

Modified: jackrabbit/branches/2.14/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java?rev=1837371&r1=1837370&r2=1837371&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
(original)
+++ jackrabbit/branches/2.14/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
Fri Aug  3 13:46:34 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/branches/2.14/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java?rev=1837371&r1=1837370&r2=1837371&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
(original)
+++ jackrabbit/branches/2.14/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Fri Aug  3 13:46:34 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/branches/2.14/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-parent/pom.xml?rev=1837371&r1=1837370&r2=1837371&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.14/jackrabbit-parent/pom.xml Fri Aug  3 13:46:34 2018
@@ -47,7 +47,7 @@
     <!-- JCR-4200 and SUREFIRE-1424 -->
     <test.opts.modules>-XX:+IgnoreUnrecognizedVMOptions --add-modules=java.xml.bind</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/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=1837371&r1=1837370&r2=1837371&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
(original)
+++ jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Fri Aug  3 13:46:34 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