[apache-directory-server] 04/07: Transition to Jetty 8

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-directory-server.

commit 04b69e3799e9fe1946c30afa23cfe13d51029b5f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 17 13:20:20 2016 +0200

    Transition to Jetty 8
---
 debian/changelog                            |  1 +
 debian/control                              |  2 +-
 debian/maven.rules                          |  3 +-
 debian/patches/03-jetty-compatibility.patch | 56 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ba5967..2bc9462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apache-directory-server (2.0.0~M15-4) UNRELEASED; urgency=medium
 
+  * Transition to Jetty 8
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index fb04db6..2069c23 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: ant,
                libbcprov-java,
                libcommons-collections3-java,
                libehcache-java (>= 2.6.11-2~),
-               libjetty-java,
+               libjetty8-java,
                liblog4j1.2-java (>= 1.2.17),
                libmaven-bundle-plugin-java,
                libmaven-dependency-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index ad504cc..30e3d22 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -9,4 +9,5 @@ log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 org.apache.directory.api s/api-.*/api-all/ * s/.*/debian/ * *
 org.apache.mina * s/.*/jar/ s/2\..*/2.x/ * *
-org.mortbay.jetty * * s/6\..*/6.x/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/debian/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ jetty-util * s/.*/debian/ * *
diff --git a/debian/patches/03-jetty-compatibility.patch b/debian/patches/03-jetty-compatibility.patch
new file mode 100644
index 0000000..dfbd8dd
--- /dev/null
+++ b/debian/patches/03-jetty-compatibility.patch
@@ -0,0 +1,56 @@
+--- a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
++++ b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
+@@ -45,13 +45,14 @@
+ import org.apache.directory.server.i18n.I18n;
+ import org.apache.directory.server.protocol.shared.transport.TcpTransport;
+ import org.bouncycastle.jce.provider.X509CertParser;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.handler.ContextHandler;
+-import org.mortbay.jetty.nio.SelectChannelConnector;
+-import org.mortbay.jetty.security.SslSocketConnector;
+-import org.mortbay.jetty.webapp.WebAppContext;
+-import org.mortbay.xml.XmlConfiguration;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.handler.HandlerList;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.handler.ContextHandler;
++import org.eclipse.jetty.server.nio.SelectChannelConnector;
++import org.eclipse.jetty.server.ssl.SslSocketConnector;
++import org.eclipse.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.xml.XmlConfiguration;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -216,13 +217,13 @@
+                 jetty.addConnector( httpsConnector );
+             }
+ 
+-            List<Handler> handlers = new ArrayList<Handler>();
++            HandlerList handlers = new HandlerList();
+             for ( WebApp w : webApps )
+             {
+                 WebAppContext webapp = new WebAppContext();
+                 webapp.setWar( w.getWarFile() );
+                 webapp.setContextPath( w.getContextPath() );
+-                handlers.add( webapp );
++                handlers.addHandler( webapp );
+ 
+                 webapp.setParentLoaderPriority( true );
+             }
+@@ -255,13 +256,13 @@
+                     }
+ 
+                     webapp.setContextPath( "/" + ctxName );
+-                    handlers.add( webapp );
++                    handlers.addHandler( webapp );
+ 
+                     webapp.setParentLoaderPriority( true );
+                 }
+             }
+ 
+-            jetty.setHandlers( handlers.toArray( new Handler[handlers.size()] ) );
++            jetty.setHandler( handlers );
+ 
+             configured = true;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 1bfc8e5..46fc269 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-jar-packaging.patch
 02-mina-compatibility.patch
+03-jetty-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-server.git