[pkg-java] r18971 - in trunk/maven-site-plugin/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-02-03 22:00:43 +0000 (Wed, 03 Feb 2016)
New Revision: 18971

Modified:
   trunk/maven-site-plugin/debian/changelog
   trunk/maven-site-plugin/debian/control
   trunk/maven-site-plugin/debian/maven.rules
   trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch
Log:
Replaced the dependency on libjetty8-java with libjetty9-java



Modified: trunk/maven-site-plugin/debian/changelog
===================================================================
--- trunk/maven-site-plugin/debian/changelog	2016-02-02 23:24:25 UTC (rev 18970)
+++ trunk/maven-site-plugin/debian/changelog	2016-02-03 22:00:43 UTC (rev 18971)
@@ -1,3 +1,10 @@
+maven-site-plugin (2.1-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Replaced the dependency on libjetty8-java with libjetty9-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Feb 2016 22:48:31 +0100
+
 maven-site-plugin (2.1-3) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/maven-site-plugin/debian/control
===================================================================
--- trunk/maven-site-plugin/debian/control	2016-02-02 23:24:25 UTC (rev 18970)
+++ trunk/maven-site-plugin/debian/control	2016-02-03 22:00:43 UTC (rev 18971)
@@ -10,8 +10,8 @@
                libdoxia-java,
                libdoxia-java-doc,
                libdoxia-sitetools-java,
-               libjetty8-java,
-               libjetty8-java-doc,
+               libjetty9-java,
+#               libjetty9-java-doc,
                libmaven-doxia-tools-java,
                libmaven-javadoc-plugin-java,
                libmaven-plugin-testing-java,

Modified: trunk/maven-site-plugin/debian/maven.rules
===================================================================
--- trunk/maven-site-plugin/debian/maven.rules	2016-02-02 23:24:25 UTC (rev 18970)
+++ trunk/maven-site-plugin/debian/maven.rules	2016-02-03 22:00:43 UTC (rev 18971)
@@ -26,10 +26,10 @@
 org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
 org.apache.maven.shared maven-doxia-tools jar s/.*/debian/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
-s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/debian/ * *
-s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/debian/ * *
 s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/9.x/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/9.x/ * *

Modified: trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch
===================================================================
--- trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch	2016-02-02 23:24:25 UTC (rev 18970)
+++ trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch	2016-02-03 22:00:43 UTC (rev 18971)
@@ -1,5 +1,5 @@
 Description: Update the dependency on Jetty. This patch can't be upstreamed yet
- because Jetty 8 use a more recent version of Java than the baseline required
+ because Jetty 9 use a more recent version of Java than the baseline required
  for this Maven plugin.
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
@@ -18,13 +18,22 @@
 +import org.eclipse.jetty.server.Connector;
 +import org.eclipse.jetty.server.Handler;
 +import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.ServerConnector;
 +import org.eclipse.jetty.server.handler.DefaultHandler;
 +import org.eclipse.jetty.server.handler.HandlerList;
-+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 +import org.eclipse.jetty.webapp.WebAppContext;
  
  /**
   * Starts the site up, rendering documents as requested for faster editing.
+@@ -81,7 +82,7 @@
+         Server server = new Server();
+         server.setStopAtShutdown( true );
+ 
+-        Connector defaultConnector = getDefaultConnector();
++        ServerConnector defaultConnector = getDefaultConnector(server);
+         server.setConnectors( new Connector[] { defaultConnector } );
+ 
+         WebAppContext webapp = createWebApplication();
 @@ -90,10 +91,9 @@
          DefaultHandler defaultHandler = new DefaultHandler();
          defaultHandler.setServer( server );
@@ -39,3 +48,18 @@
  
          getLog().info( "Starting Jetty on http://localhost:" + port + "/" );
          try
+@@ -218,11 +218,11 @@
+         return webapp;
+     }
+ 
+-    private Connector getDefaultConnector()
++    private ServerConnector getDefaultConnector(Server server)
+     {
+-        Connector connector = new SelectChannelConnector();
++        ServerConnector connector = new ServerConnector(server);
+         connector.setPort( port );
+-        connector.setMaxIdleTime( MAX_IDLE_TIME );
++        connector.setIdleTimeout( MAX_IDLE_TIME );
+         return connector;
+     }
+