You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/11 10:45:32 UTC
svn commit: r1833316 - in /jackrabbit/branches/2.8: ./ jackrabbit-jcr-server/
jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/
jackrabbit-jcr2dav/
jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/
jackrabbit-parent...
Author: reschke
Date: Mon Jun 11 10:45:31 2018
New Revision: 1833316
URL: http://svn.apache.org/viewvc?rev=1833316&view=rev
Log:
JCR-4184: migrate from org.mortbay.jetty to org.eclipse.jetty (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-jcr-server/pom.xml
jackrabbit/branches/2.8/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
jackrabbit/branches/2.8/jackrabbit-jcr2dav/pom.xml
jackrabbit/branches/2.8/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
jackrabbit/branches/2.8/jackrabbit-parent/pom.xml
jackrabbit/branches/2.8/jackrabbit-standalone/pom.xml
jackrabbit/branches/2.8/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
jackrabbit/branches/2.8/jackrabbit-standalone/src/main/resources/logback.xml
jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 11 10:45:31 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1810108,1811667,1814831,1817097,1821597,1822947,1822950,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808754,1810108,1811667,1814831,1817097,1821597,1822947,1822950,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-server/pom.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-server/pom.xml Mon Jun 11 10:45:31 2018
@@ -235,8 +235,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java Mon Jun 11 10:45:31 2018
@@ -27,10 +27,10 @@ import junit.framework.TestCase;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.commons.JcrUtils;
import org.apache.jackrabbit.util.Text;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,10 +67,8 @@ public class LitmusTest extends TestCase
});
holder.setInitParameter("resource-config", "/config.xml");
- Context context = new Context(server, "/");
- context.setResourceBase("src/test/resources");
- context.addServlet(holder, "/*");
- server.addHandler(context);
+ ServletContextHandler schandler = new ServletContextHandler(server, "/");
+ schandler.addServlet(holder, "/*");
server.start();
try {
Modified: jackrabbit/branches/2.8/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr2dav/pom.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr2dav/pom.xml Mon Jun 11 10:45:31 2018
@@ -170,8 +170,13 @@ org.apache.jackrabbit.test.api.query.qom
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/branches/2.8/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java Mon Jun 11 10:45:31 2018
@@ -27,10 +27,10 @@ import org.apache.jackrabbit.core.Jackra
import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet;
import org.apache.jackrabbit.test.RepositoryStubException;
import org.apache.jackrabbit.webdav.jcr.JCRWebdavServerServlet;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
public class RepositoryStubImpl extends JackrabbitRepositoryStub {
@@ -77,9 +77,8 @@ public class RepositoryStubImpl extends
JCRWebdavServerServlet.INIT_PARAM_MISSING_AUTH_MAPPING,
"");
- Context context = new Context(server, "/");
- context.addServlet(holder, "/*");
- server.addHandler(context);
+ ServletContextHandler schandler = new ServletContextHandler(server, "/");
+ schandler.addServlet(holder, "/*");
try {
server.start();
Modified: jackrabbit/branches/2.8/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-parent/pom.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-parent/pom.xml Mon Jun 11 10:45:31 2018
@@ -43,7 +43,7 @@
</issueManagement>
<properties>
- <jetty.version>6.1.22</jetty.version>
+ <jetty.version>8.2.0.v20160908</jetty.version>
<tika.version>1.7</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<clirr.baseline.version>2.2.0</clirr.baseline.version>
@@ -470,17 +470,27 @@
<version>1.3.3</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
Modified: jackrabbit/branches/2.8/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-standalone/pom.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-standalone/pom.xml Mon Jun 11 10:45:31 2018
@@ -86,19 +86,19 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
- <!--
- JCR-1882: Explicitly declare versions of transitive Jetty dependencies
- to avoid problems with the ${project.version} setting that Jetty uses.
- -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
Modified: jackrabbit/branches/2.8/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java Mon Jun 11 10:45:31 2018
@@ -40,13 +40,13 @@ 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.mortbay.jetty.Connector;
-import org.mortbay.jetty.NCSARequestLog;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.webapp.WebAppContext;
+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.handler.RequestLogHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
*
Modified: jackrabbit/branches/2.8/jackrabbit-standalone/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-standalone/src/main/resources/logback.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-standalone/src/main/resources/logback.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-standalone/src/main/resources/logback.xml Mon Jun 11 10:45:31 2018
@@ -31,7 +31,7 @@
</encoder>
</appender>
- <logger name="org.mortbay.log" level="${log.level}" additivity="false">
+ <logger name="org.eclipse.log" level="${log.level}" additivity="false">
<appender-ref ref="jetty"/>
</logger>
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml?rev=1833316&r1=1833315&r2=1833316&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml Mon Jun 11 10:45:31 2018
@@ -145,13 +145,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>