zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1757585 - in /zookeeper/branches/branch-3.5: ./ docs/ src/contrib/loggraph/ src/docs/src/documentation/content/xdocs/ src/java/main/org/apache/zookeeper/server/admin/
Date Thu, 25 Aug 2016 00:24:19 GMT
Author: phunt
Date: Thu Aug 25 00:24:19 2016
New Revision: 1757585

URL: http://svn.apache.org/viewvc?rev=1757585&view=rev
Log:
ZOOKEEPER-2489: Upgrade Jetty dependency to a recent stable release version. (Edward Ribeiro
via phunt)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/docs/index.pdf
    zookeeper/branches/branch-3.5/docs/javaExample.pdf
    zookeeper/branches/branch-3.5/docs/linkmap.pdf
    zookeeper/branches/branch-3.5/docs/recipes.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
    zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
    zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
    zookeeper/branches/branch-3.5/ivy.xml
    zookeeper/branches/branch-3.5/src/contrib/loggraph/ivy.xml
    zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
    zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Thu Aug 25 00:24:19 2016
@@ -37,6 +37,9 @@ IMPROVEMENTS:
   ZOOKEEPER-2505: Use shared library instead of static library in C
   client unit test (Michael Han via phunt)
 
+  ZOOKEEPER-2489: Upgrade Jetty dependency to a recent stable release
+  version. (Edward Ribeiro via phunt)
+
 
 Release 3.5.2 - 06/29/2016
 

Modified: zookeeper/branches/branch-3.5/docs/index.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/index.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/javaExample.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/javaExample.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/linkmap.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/recipes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/recipes.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html Thu Aug 25 00:24:19 2016
@@ -1866,6 +1866,17 @@ server.3=zoo3:2888:3888</pre>
 <p>The port the embedded Jetty server listens on.  Defaults to 8080.</p>
 </dd>
 
+            
+<dt>
+<term>admin.idleTimeout</term>
+</dt>
+<dd>
+<p>(Java system property: <strong>zookeeper.admin.idleTimeout</strong>)</p>
+<p>Set the maximum idle time in milliseconds that a connection can wait 
+                          before sending or receiving data. Defaults to 30000 ms.</p>
+</dd>
+
+
           
 <dt>
 <term>admin.commandURL</term>

Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf (original)
and zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf Thu Aug 25 00:24:19
2016 differ

Modified: zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
Thu Aug 25 00:24:19 2016 differ

Modified: zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
Thu Aug 25 00:24:19 2016 differ

Modified: zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
Thu Aug 25 00:24:19 2016 differ

Modified: zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
Binary files - no diff available.

Modified: zookeeper/branches/branch-3.5/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/ivy.xml?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/ivy.xml (original)
+++ zookeeper/branches/branch-3.5/ivy.xml Thu Aug 25 00:24:19 2016
@@ -77,8 +77,10 @@
 
     <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
 
-    <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26"
+    <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.2.18.v20160721"
                 conf="optional->default"/>
+      <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.2.18.v20160721"
+                  conf="optional->default"/>
     <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.11"
                 conf="optional->default"/>
   </dependencies>

Modified: zookeeper/branches/branch-3.5/src/contrib/loggraph/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/loggraph/ivy.xml?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/loggraph/ivy.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/loggraph/ivy.xml Thu Aug 25 00:24:19 2016
@@ -36,8 +36,8 @@
   
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
     <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
-    <dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
-    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.0.1.v20091125" />
+    <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.2.18.v20160721" />
+    <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.2.18.v20160721" />
     <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1" />
   </dependencies>
 

Modified: zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
(original)
+++ zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
Thu Aug 25 00:24:19 2016
@@ -1531,6 +1531,19 @@ server.3=zoo3:2888:3888</programlisting>
             </listitem>
           </varlistentry>
 
+            <varlistentry>
+                <term>admin.idleTimeout</term>
+
+                <listitem>
+                    <para>(Java system property: <emphasis
+                            role="bold">zookeeper.admin.idleTimeout</emphasis>)</para>
+
+                    <para>Set the maximum idle time in milliseconds that a connection
can wait 
+                          before sending or receiving data. Defaults to 30000 ms.</para>
+                </listitem>
+            </varlistentry>
+
+
           <varlistentry>
             <term>admin.commandURL</term>
 

Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java?rev=1757585&r1=1757584&r2=1757585&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java
(original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/server/admin/JettyAdminServer.java
Thu Aug 25 00:24:19 2016
@@ -31,10 +31,11 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.zookeeper.server.ZooKeeperServer;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,36 +56,42 @@ public class JettyAdminServer implements
     static final Logger LOG = LoggerFactory.getLogger(JettyAdminServer.class);
 
     public static final int DEFAULT_PORT = 8080;
-    private static final String DEFAULT_ADDRESS = "0.0.0.0";
+    public static final int DEFAULT_IDLE_TIMEOUT = 30000;
     public static final String DEFAULT_COMMAND_URL = "/commands";
+    private static final String DEFAULT_ADDRESS = "0.0.0.0";
 
     private final Server server;
-    private ZooKeeperServer zkServer;
+    private final String address;
     private final int port;
-    private String address;
+    private final int idleTimeout;
     private final String commandUrl;
+    private ZooKeeperServer zkServer;
 
     public JettyAdminServer() throws AdminServerException {
-        this(System.getProperty("zookeeper.admin.serverAddress",
-                DEFAULT_ADDRESS), Integer.getInteger(
-                "zookeeper.admin.serverPort", DEFAULT_PORT), System
-                .getProperty("zookeeper.admin.commandURL", DEFAULT_COMMAND_URL));
+        this(System.getProperty("zookeeper.admin.serverAddress", DEFAULT_ADDRESS),
+             Integer.getInteger("zookeeper.admin.serverPort", DEFAULT_PORT),
+             Integer.getInteger("zookeeper.admin.idleTimeout", DEFAULT_IDLE_TIMEOUT),
+             System.getProperty("zookeeper.admin.commandURL", DEFAULT_COMMAND_URL));
     }
 
-    public JettyAdminServer(String address, int port, String commandUrl) {
+    public JettyAdminServer(String address, int port, int timeout, String commandUrl) {
         this.port = port;
+        this.idleTimeout = timeout;
         this.commandUrl = commandUrl;
         this.address = address;
 
         server = new Server();
-        SelectChannelConnector connector = new SelectChannelConnector();
+        ServerConnector connector = new ServerConnector(server);
         connector.setHost(address);
         connector.setPort(port);
+        connector.setIdleTimeout(idleTimeout);
         server.addConnector(connector);
-        Context context = new Context(server, "/");
+
+        ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/*");
         server.setHandler(context);
-        context.addServlet(new ServletHolder(new CommandServlet()), commandUrl
-                + "/*");
+
+        context.addServlet(new ServletHolder(new CommandServlet()), commandUrl + "/*");
     }
 
     /**
@@ -149,7 +156,7 @@ public class JettyAdminServer implements
                 // No command specified, print links to all commands instead
                 for (String link : commandLinks()) {
                     response.getWriter().println(link);
-                    response.getWriter().println("<br />");
+                    response.getWriter().println("<br/>");
                 }
                 return;
             }



Mime
View raw message