activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r384439 - in /incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http: BlockingQueueTransport.java HttpClientTransport.java HttpTransportFactory.java HttpTransportServer.java HttpTunnelServlet.java
Date Thu, 09 Mar 2006 05:42:57 GMT
Author: aco
Date: Wed Mar  8 21:42:56 2006
New Revision: 384439

URL: http://svn.apache.org/viewcvs?rev=384439&view=rev
Log:
Minor cleanup and remove some System.out

Modified:
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
    incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java?rev=384439&r1=384438&r2=384439&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
(original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/BlockingQueueTransport.java
Wed Mar  8 21:42:56 2006
@@ -24,8 +24,6 @@
 import org.apache.activemq.transport.TransportSupport;
 import org.apache.activemq.util.ServiceStopper;
 
-import javax.jms.JMSException;
-
 import java.io.IOException;
 
 /**

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java?rev=384439&r1=384438&r2=384439&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
(original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpClientTransport.java
Wed Mar  8 21:42:56 2006
@@ -47,7 +47,7 @@
 public class HttpClientTransport extends HttpTransportSupport {
     private static final Log log = LogFactory.getLog(HttpClientTransport.class);
 
-    public static final int MAX_CLIENT_TIMEOUT = 20000;
+    public static final int MAX_CLIENT_TIMEOUT = 30000;
 
     private HttpClient sendHttpClient;
     private HttpClient receiveHttpClient;

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java?rev=384439&r1=384438&r2=384439&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
(original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
Wed Mar  8 21:42:56 2006
@@ -54,9 +54,6 @@
     protected Transport createTransport(URI location, WireFormat wf) throws MalformedURLException
{
         TextWireFormat textWireFormat = asTextWireFormat(wf);
         Transport transport = new HttpClientTransport(textWireFormat, location);
-        //Transport transport = new HttpTransport(textWireFormat, location);
-        //transport = new MutexTransport(transport);
-        //transport = new ResponseCorrelator(transport);
         return transport;
     }
 

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java?rev=384439&r1=384438&r2=384439&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
(original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
Wed Mar  8 21:42:56 2006
@@ -25,7 +25,6 @@
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.bio.SocketConnector;
 import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.servlet.ServletHandler;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.servlet.ServletMapping;

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java?rev=384439&r1=384438&r2=384439&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
(original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
Wed Mar  8 21:42:56 2006
@@ -20,7 +20,6 @@
 import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.command.Command;
-import org.apache.activemq.command.CommandTypes;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.KeepAliveInfo;
 import org.apache.activemq.command.WireFormatInfo;
@@ -75,14 +74,12 @@
         // lets return the next response
         Command packet = null;
         try {
-            System.err.println("\nrequest="+request);
             BlockingQueueTransport transportChannel = getTransportChannel(request);
             if (transportChannel == null) {
                 log("No transport available! ");
                 return;
             }
             packet = (Command) transportChannel.getQueue().poll(requestTimeout, TimeUnit.MILLISECONDS);
-            System.err.println("packet="+packet);
         }
         catch (InterruptedException e) {
             // ignore
@@ -99,21 +96,8 @@
 
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws
ServletException, IOException {
 
-        // String body = readRequestBody(request);
-        // Command command = wireFormat.readCommand(body);
-
         // Read the command directly from the reader
-        //Command command = wireFormat.readCommand(request.getReader());
-
-        // Build the command xml before passing it to the reader
-        BufferedReader buffRead = request.getReader();
-        String commandXml = "";
-        String line;
-        while ((line = buffRead.readLine()) != null) {
-            commandXml += line;
-        }
-
-        Command command = wireFormat.readCommand(commandXml);
+        Command command = wireFormat.readCommand(request.getReader());
 
         if (command instanceof WireFormatInfo) {
             WireFormatInfo info = (WireFormatInfo) command;
@@ -168,7 +152,6 @@
         if (clientID == null) {
             clientID = request.getHeader("clientID");
         }
-        System.out.println("clientID="+clientID);
         /**
          * if (clientID == null) { clientID = request.getParameter("clientID"); }
          */



Mime
View raw message