You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/02/01 16:16:48 UTC
svn commit: r739778 - in /webservices/commons/trunk/modules/tcpmon/modules:
tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/
tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/
tcpmon-core/src/main/java/org/apache/ws/co...
Author: veithen
Date: Sun Feb 1 15:16:47 2009
New Revision: 739778
URL: http://svn.apache.org/viewvc?rev=739778&view=rev
Log:
Fixed connection handling when resending a request.
Added:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java (with props)
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/AbstractListener.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/IRequestResponse.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/AbstractRequestResponse.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/RequestResponse.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/RequestResponse.java
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/AbstractListener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/AbstractListener.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/AbstractListener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/AbstractListener.java Sun Feb 1 15:16:47 2009
@@ -16,15 +16,13 @@
package org.apache.ws.commons.tcpmon.core;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
+import java.io.OutputStream;
import org.apache.ws.commons.tcpmon.core.ui.AbstractRequestResponse;
public abstract class AbstractListener {
protected void resend(AbstractRequestResponse requestResponse) {
try {
- InputStream in = null;
String text = requestResponse.getRequestAsString();
// Fix Content-Length HTTP headers
@@ -58,8 +56,12 @@
System.err.println("\nTEXT: '" + text + "'");
}
}
- in = new ByteArrayInputStream(text.getBytes());
- new Connection(this, in).start();
+ RawSender sender = new RawSender(this, requestResponse.getTargetHost(),
+ requestResponse.getTargetPort());
+ new Thread(sender).start();
+ OutputStream out = sender.getOutputStream();
+ out.write(text.getBytes());
+ out.close();
} catch (Exception e) {
e.printStackTrace();
}
@@ -68,5 +70,5 @@
public abstract Configuration getConfiguration();
public abstract void onServerSocketStart();
public abstract void onServerSocketError(Throwable ex);
- public abstract IRequestResponse createRequestResponse(String fromHost, String targetHost);
+ public abstract IRequestResponse createRequestResponse(String fromHost);
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java Sun Feb 1 15:16:47 2009
@@ -108,7 +108,7 @@
fromHost = "resend";
}
String targetHost = config.getTargetHost();
- requestResponse = listener.createRequestResponse(fromHost, targetHost);
+ requestResponse = listener.createRequestResponse(fromHost);
int targetPort = config.getTargetPort();
InputStream tmpIn1 = inputStream;
OutputStream tmpOut1 = null;
@@ -126,6 +126,7 @@
if (config.isProxy()) {
requestFilter.addHandler(new HttpProxyServerHandler() {
protected void handleConnection(String host, int port) {
+ requestResponse.setTarget(host, port);
try {
outSocket = new Socket(host, port);
} catch (IOException ex) {
@@ -134,6 +135,7 @@
}
});
} else {
+ requestResponse.setTarget(targetHost, targetPort);
requestFilter.addHandler(new HttpHeaderRewriter("Host", targetHost + ":" + targetPort));
outSocket = new Socket(targetHost, targetPort);
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/IRequestResponse.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/IRequestResponse.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/IRequestResponse.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/IRequestResponse.java Sun Feb 1 15:16:47 2009
@@ -28,7 +28,7 @@
int STATE_DONE = 3;
int STATE_ERROR = 4;
- void setOutHost(String outHost);
+ void setTarget(String targetHost, int targetPort);
void setState(int state);
void setElapsed(long elapsed);
OutputStream getRequestOutputStream();
Added: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java?rev=739778&view=auto
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java (added)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java Sun Feb 1 15:16:47 2009
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ws.commons.tcpmon.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+import org.apache.ws.commons.tcpmon.core.filter.Pipeline;
+import org.apache.ws.commons.tcpmon.core.filter.Stream;
+import org.apache.ws.commons.tcpmon.core.filter.StreamFilter;
+import org.apache.ws.commons.tcpmon.core.filter.Tee;
+import org.apache.ws.commons.tcpmon.core.filter.http.AbstractHttpResponseHandler;
+import org.apache.ws.commons.tcpmon.core.filter.http.HttpProxyClientHandler;
+import org.apache.ws.commons.tcpmon.core.filter.http.HttpRequestFilter;
+import org.apache.ws.commons.tcpmon.core.filter.http.HttpResponseFilter;
+
+/**
+ * Sends a raw HTTP request and invokes {@link IRequestResponse} as necessary.
+ */
+public class RawSender implements Runnable {
+ private final IRequestResponse requestResponse;
+ private final Socket socket;
+ private final OutputStream out;
+
+ public RawSender(AbstractListener listener, String targetHost, int targetPort) throws IOException {
+ Configuration config = listener.getConfiguration();
+ requestResponse = listener.createRequestResponse("resend");
+ requestResponse.setTarget(targetHost, targetPort);
+ Pipeline pipeline = new Pipeline();
+ pipeline.addFilter(new Tee(requestResponse.getRequestOutputStream()));
+ if (config.getHttpProxyHost() != null) {
+ HttpRequestFilter requestFilter = new HttpRequestFilter(false);
+ pipeline.addFilter(requestFilter);
+ requestFilter.addHandler(new HttpProxyClientHandler(targetHost, targetPort));
+ socket = new Socket(config.getHttpProxyHost(), config.getHttpProxyPort());
+ } else {
+ socket = new Socket(targetHost, targetPort);
+ }
+ requestResponse.setState(IRequestResponse.STATE_ACTIVE);
+ pipeline.addFilter(new StreamFilter() {
+ public void invoke(Stream stream) {
+ stream.skipAll();
+ if (stream.isEndOfStream()) {
+ requestResponse.setState(IRequestResponse.STATE_REQ);
+ }
+ }
+ });
+ pipeline.addFilter(new Tee(socket.getOutputStream()));
+ out = pipeline.getOutputStream();
+ }
+
+ public OutputStream getOutputStream() {
+ return out;
+ }
+
+ public void run() {
+ long start = System.currentTimeMillis();
+ Pipeline pipeline = new Pipeline();
+ pipeline.addFilter(new Tee(requestResponse.getResponseOutputStream()));
+ HttpResponseFilter filter = new HttpResponseFilter(false);
+ pipeline.addFilter(filter);
+ filter.addHandler(new AbstractHttpResponseHandler() {
+ public void responseCompleted() {
+ try {
+ socket.shutdownInput();
+ socket.shutdownOutput();
+ } catch (IOException ex) {
+ // Ignore
+ }
+ }
+ });
+ try {
+ InputStream in = socket.getInputStream();
+ while (pipeline.readFrom(in) != -1) {
+ // Just loop
+ }
+ requestResponse.setState(IRequestResponse.STATE_DONE);
+ } catch (IOException ex) {
+ requestResponse.setState(IRequestResponse.STATE_ERROR);
+ requestResponse.onError(ex);
+ } finally {
+ requestResponse.setElapsed(System.currentTimeMillis() - start);
+ try {
+ socket.close();
+ } catch (IOException ex) {
+ // Ignore
+ }
+ }
+ }
+}
Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/RawSender.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java Sun Feb 1 15:16:47 2009
@@ -27,4 +27,7 @@
public String handleHeader(String name, String value) {
return value;
}
+
+ public void requestCompleted() {
+ }
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java Sun Feb 1 15:16:47 2009
@@ -27,4 +27,7 @@
public String handleHeader(String name, String value) {
return value;
}
+
+ public void responseCompleted() {
+ }
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java Sun Feb 1 15:16:47 2009
@@ -108,6 +108,7 @@
stream.popFilter();
}
}
+ completed();
}
break;
}
@@ -120,6 +121,7 @@
}
protected abstract String processFirstLine(String firstList);
+ protected abstract void completed();
private String processHeader(String name, String value) {
if (name.equalsIgnoreCase("Content-Length")) {
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java Sun Feb 1 15:16:47 2009
@@ -37,4 +37,10 @@
}
return firstLine;
}
+
+ protected void completed() {
+ for (Iterator it = handlers.iterator(); it.hasNext(); ) {
+ ((HttpRequestHandler)it.next()).requestCompleted();
+ }
+ }
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java Sun Feb 1 15:16:47 2009
@@ -23,4 +23,5 @@
*/
public interface HttpRequestHandler extends HeaderHandler {
String processRequestLine(String requestLine);
+ void requestCompleted();
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java Sun Feb 1 15:16:47 2009
@@ -37,4 +37,10 @@
}
return firstLine;
}
+
+ protected void completed() {
+ for (Iterator it = handlers.iterator(); it.hasNext(); ) {
+ ((HttpResponseHandler)it.next()).responseCompleted();
+ }
+ }
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java Sun Feb 1 15:16:47 2009
@@ -23,4 +23,5 @@
*/
public interface HttpResponseHandler extends HeaderHandler {
String processResponseLine(String responseLine);
+ void responseCompleted();
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/AbstractRequestResponse.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/AbstractRequestResponse.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/AbstractRequestResponse.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/AbstractRequestResponse.java Sun Feb 1 15:16:47 2009
@@ -48,6 +48,8 @@
private static final Charset UTF8 = Charset.forName("utf-8");
private final Configuration config;
+ private String targetHost;
+ private int targetPort;
public AbstractRequestResponse(Configuration config) {
this.config = config;
@@ -63,6 +65,20 @@
setState(states[state]);
}
+ public String getTargetHost() {
+ return targetHost;
+ }
+
+ public int getTargetPort() {
+ return targetPort;
+ }
+
+ public void setTarget(String targetHost, int targetPort) {
+ this.targetHost = targetHost;
+ this.targetPort = targetPort;
+ setOutHost(targetHost);
+ }
+
public OutputStream getRequestOutputStream() {
Pipeline pipeline = new Pipeline();
pipeline.addFilter(new RequestLineExtractor(50) {
@@ -103,6 +119,7 @@
}
protected abstract void setState(String state);
+ protected abstract void setOutHost(String outHost);
protected abstract void setRequest(String request);
protected abstract Writer getRequestWriter();
protected abstract Writer getResponseWriter();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java Sun Feb 1 15:16:47 2009
@@ -645,7 +645,7 @@
});
}
- public IRequestResponse createRequestResponse(String fromHost, String targetHost) {
- return new RequestResponse(this, fromHost, targetHost);
+ public IRequestResponse createRequestResponse(String fromHost) {
+ return new RequestResponse(this, fromHost);
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/RequestResponse.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/RequestResponse.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/RequestResponse.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/RequestResponse.java Sun Feb 1 15:16:47 2009
@@ -37,7 +37,7 @@
*/
Text outputText = null;
- public RequestResponse(final Listener listener, final String fromHost, final String targetHost) {
+ public RequestResponse(final Listener listener, final String fromHost) {
super(listener.getConfiguration());
this.listener = listener;
final int count = listener.requestResponses.size();
@@ -48,7 +48,7 @@
item.setText(new String[]{TCPMonBundle.getMessage("active00", "Active"),
getTime(),
fromHost,
- targetHost,
+ "",
"", ""});
listener.tableEnhancer.setSelectionInterval(0, 0);
}
@@ -84,7 +84,7 @@
}
}
- public void setOutHost(String outHost) {
+ protected void setOutHost(String outHost) {
setValue(MainView.OUTHOST_COLUMN, outHost);
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java Sun Feb 1 15:16:47 2009
@@ -619,7 +619,7 @@
stop();
}
- public IRequestResponse createRequestResponse(String fromHost, String targetHost) {
- return new RequestResponse(this, fromHost, targetHost);
+ public IRequestResponse createRequestResponse(String fromHost) {
+ return new RequestResponse(this, fromHost);
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/RequestResponse.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/RequestResponse.java?rev=739778&r1=739777&r2=739778&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/RequestResponse.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/RequestResponse.java Sun Feb 1 15:16:47 2009
@@ -46,8 +46,7 @@
*/
JScrollPane outputScroll = null;
- public RequestResponse(Listener listener, String fromHost,
- String targetHost) {
+ public RequestResponse(Listener listener, String fromHost) {
super(listener.getConfiguration());
this.listener = listener;
int count = listener.requestResponses.size();
@@ -56,7 +55,7 @@
TCPMonBundle.getMessage("active00","Active"),
getTime(),
fromHost,
- targetHost,
+ "",
""});
listener.requestResponses.add(this);
inputText = new JTextArea(null, null, 20, 80);
@@ -87,7 +86,7 @@
}
}
- public void setOutHost(String outHost) {
+ protected void setOutHost(String outHost) {
setValue(TCPMon.OUTHOST_COLUMN, outHost);
}