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/06/06 01:02:02 UTC
svn commit: r782160 - in /webservices/commons/trunk/modules/tcpmon: ./
modules/tcpmon-core/
modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/
modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/
modules/tcpmon-core/...
Author: veithen
Date: Fri Jun 5 23:02:01 2009
New Revision: 782160
URL: http://svn.apache.org/viewvc?rev=782160&view=rev
Log:
Migrate to Java 1.5.
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Interceptor.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/SocketRR.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/CharsetDecoderFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Pipeline.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/StreamUtil.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Tee.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/Headers.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HostRewriter.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/HttpProxyClientHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyServerHandler.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/HttpResponseFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/IdentityEncoder.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/mime/ChainedContentFilterFactory.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-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/DefaultContentFilterFactory.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/RawSender.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorDirectTest.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorProxyTest.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorTestBase.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml
webservices/commons/trunk/modules/tcpmon/pom.xml
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/pom.xml Fri Jun 5 23:02:01 2009
@@ -69,13 +69,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/Relay.java Fri Jun 5 23:02:01 2009
@@ -44,6 +44,7 @@
public String getEncoding() {
return enc;
}
+ @Override
public void run() {
int n;
try {
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/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/engine/Connection.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Connection.java Fri Jun 5 23:02:01 2009
@@ -102,6 +102,7 @@
/**
* Method run
*/
+ @Override
public void run() {
try {
active = true;
@@ -120,6 +121,7 @@
HostRewriter hostRewriter;
if (config.isProxy()) {
requestFilter.addHandler(new HttpProxyServerHandler() {
+ @Override
protected void handleConnection(String host, int port) {
try {
connectToTarget(host, port);
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Interceptor.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Interceptor.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Interceptor.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/Interceptor.java Fri Jun 5 23:02:01 2009
@@ -18,7 +18,6 @@
import java.net.ServerSocket;
import java.net.Socket;
-import java.util.Iterator;
import java.util.Vector;
/**
@@ -40,7 +39,7 @@
*/
boolean pleaseStop = false;
- private final Vector connections = new Vector();
+ private final Vector<Connection> connections = new Vector<Connection>();
/**
* Constructor.
@@ -57,6 +56,7 @@
/**
* Method run
*/
+ @Override
public void run() {
try {
if (listener != null) {
@@ -92,8 +92,8 @@
if (sSocket != null) {
sSocket.close();
}
- for (Iterator it = connections.iterator(); it.hasNext(); ) {
- ((Connection)it.next()).halt();
+ for (Connection connection : connections) {
+ connection.halt();
}
} catch (Exception e) {
e.printStackTrace();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java Fri Jun 5 23:02:01 2009
@@ -41,8 +41,8 @@
private boolean proxy;
private String httpProxyHost;
private int httpProxyPort;
- private final List/*<StreamFilterFactory>*/ requestFilters = new ArrayList();
- private final List/*<StreamFilterFactory>*/ responseFilters = new ArrayList();
+ private final List<StreamFilterFactory> requestFilters = new ArrayList<StreamFilterFactory>();
+ private final List<StreamFilterFactory> responseFilters = new ArrayList<StreamFilterFactory>();
private ContentFilterFactory requestContentFilterFactory;
private ContentFilterFactory responseContentFilterFactory;
private boolean replaceURIsInContent;
@@ -159,8 +159,8 @@
}
return new InterceptorConfiguration(serverSocketFactory, listenPort, socketFactory,
targetHost, targetPort, proxy, httpProxyHost, httpProxyPort,
- (StreamFilterFactory[])requestFilters.toArray(new StreamFilterFactory[requestFilters.size()]),
- (StreamFilterFactory[])responseFilters.toArray(new StreamFilterFactory[responseFilters.size()]),
+ requestFilters.toArray(new StreamFilterFactory[requestFilters.size()]),
+ responseFilters.toArray(new StreamFilterFactory[responseFilters.size()]),
requestContentFilterFactory, responseContentFilterFactory, replaceURIsInContent);
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/SocketRR.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/SocketRR.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/SocketRR.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/SocketRR.java Fri Jun 5 23:02:01 2009
@@ -109,6 +109,7 @@
/**
* Method run
*/
+ @Override
public void run() {
try {
long start = System.currentTimeMillis();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/CharsetDecoderFilter.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/CharsetDecoderFilter.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/CharsetDecoderFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/CharsetDecoderFilter.java Fri Jun 5 23:02:01 2009
@@ -57,7 +57,7 @@
stream.error("Too many input errors; stop reporting.");
reportErrors = false;
} else {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append("Malformed input for charset ");
buffer.append(decoder.charset().name());
buffer.append(':');
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Pipeline.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/Pipeline.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Pipeline.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Pipeline.java Fri Jun 5 23:02:01 2009
@@ -324,25 +324,29 @@
private class OutputStreamImpl extends OutputStream {
public OutputStreamImpl() {}
+ @Override
public void write(int b) throws IOException {
write(new byte[] { (byte)b });
}
+ @Override
public void write(byte[] b, int off, int len) throws IOException {
first.invoke(b, off, len, false, true);
}
+ @Override
public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
+ @Override
public void close() throws IOException {
first.invoke(new byte[0], 0, 0, true, false);
}
}
private final int bufferSize;
- private final LinkedList buffers = new LinkedList();
+ private final LinkedList<byte[]> buffers = new LinkedList<byte[]>();
private ErrorListener errorListener = ErrorListener.DEFAULT;
private StreamImpl first;
private StreamImpl last;
@@ -356,7 +360,7 @@
}
byte[] allocateBuffer() {
- return buffers.isEmpty() ? new byte[bufferSize] : (byte[])buffers.removeFirst();
+ return buffers.isEmpty() ? new byte[bufferSize] : buffers.removeFirst();
}
void releaseBuffer(byte[] buffer) {
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/StreamUtil.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/StreamUtil.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/StreamUtil.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/StreamUtil.java Fri Jun 5 23:02:01 2009
@@ -47,7 +47,7 @@
* Convert a part of a stream to a string, using the ASCII charset encoding.
*/
public static String getAsciiString(Stream stream, int begin, int end) {
- StringBuffer buffer = new StringBuffer(end-begin);
+ StringBuilder buffer = new StringBuilder(end-begin);
for (int i=begin; i<end; i++) {
buffer.append((char)stream.get(i));
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Tee.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/Tee.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Tee.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/Tee.java Fri Jun 5 23:02:01 2009
@@ -57,6 +57,7 @@
}
}
+ @Override
public String toString() {
return "[out=" + out + "]";
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/Headers.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/Headers.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/Headers.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/Headers.java Fri Jun 5 23:02:01 2009
@@ -21,16 +21,15 @@
import java.util.List;
import java.util.ListIterator;
-public class Headers {
- private final List/*<Header>*/ headers = new LinkedList();
+public class Headers implements Iterable<Header> {
+ private final List<Header> headers = new LinkedList<Header>();
public void add(String name, String value) {
headers.add(new Header(name, value));
}
public Header getFirst(String name) {
- for (Iterator it = headers.iterator(); it.hasNext(); ) {
- Header header = (Header)it.next();
+ for (Header header : headers) {
if (header.getName().equalsIgnoreCase(name)) {
return header;
}
@@ -41,8 +40,8 @@
public void set(String name, String value) {
boolean replaced = false;
Header newHeader = new Header(name, value);
- for (ListIterator it = headers.listIterator(); it.hasNext(); ) {
- Header header = (Header)it.next();
+ for (ListIterator<Header> it = headers.listIterator(); it.hasNext(); ) {
+ Header header = it.next();
if (header.getName().equalsIgnoreCase(name)) {
if (replaced) {
it.remove();
@@ -57,7 +56,7 @@
}
}
- public Iterator iterator() {
+ public Iterator<Header> iterator() {
return headers.iterator();
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HostRewriter.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/HostRewriter.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HostRewriter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HostRewriter.java Fri Jun 5 23:02:01 2009
@@ -28,7 +28,7 @@
public HostRewriter(String targetHost, int targetPort, boolean isSecure) {
this.targetHost = targetHost;
this.targetPort = targetPort;
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(isSecure ? "https" : "http");
buffer.append("://");
buffer.append(targetHost);
@@ -61,6 +61,7 @@
}
}
+ @Override
public void processRequestHeaders(Headers headers) {
Header header = headers.getFirst("Host");
if (header != null) {
@@ -70,6 +71,7 @@
}
}
+ @Override
public void processResponseHeaders(Headers headers) {
if (orgBaseUri != null) {
rewriteUriHeaders(headers, rewritableResponseHeaders, targetBaseUri, orgBaseUri);
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=782160&r1=782159&r2=782160&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 Fri Jun 5 23:02:01 2009
@@ -16,8 +16,6 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
-import java.util.Iterator;
-
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
@@ -134,8 +132,7 @@
StreamFilter transferEncoder = null;
StreamFilter contentDecoder = null;
StreamFilter contentEncoder = null;
- for (Iterator it = headers.iterator(); it.hasNext(); ) {
- Header header = (Header)it.next();
+ for (Header header : headers) {
String name = header.getName();
String value = header.getValue();
if (name.equalsIgnoreCase("Content-Length")) {
@@ -170,8 +167,7 @@
if (discardHeaders && contentFilterChain != null) {
headerParser.discard();
} else {
- for (Iterator it = headers.iterator(); it.hasNext(); ) {
- Header header = (Header)it.next();
+ for (Header header : headers) {
headerParser.insert(header.getName(), header.getValue());
}
headerParser.skip();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyClientHandler.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/HttpProxyClientHandler.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyClientHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyClientHandler.java Fri Jun 5 23:02:01 2009
@@ -28,6 +28,7 @@
this.targetPort = targetPort;
}
+ @Override
public String processRequestLine(String requestLine) {
String[] parts = requestLine.split(" ");
return parts[0] + " http://" + targetHost + ":" + targetPort + parts[1] + " " + parts[2];
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyServerHandler.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/HttpProxyServerHandler.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyServerHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpProxyServerHandler.java Fri Jun 5 23:02:01 2009
@@ -25,6 +25,7 @@
* Handler that rewrites an HTTP proxy request to a plain HTTP request.
*/
public abstract class HttpProxyServerHandler extends AbstractHttpRequestHandler {
+ @Override
public String processRequestLine(String requestLine) {
String[] parts = requestLine.split(" ");
URL url;
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=782160&r1=782159&r2=782160&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 Fri Jun 5 23:02:01 2009
@@ -16,7 +16,6 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -25,7 +24,7 @@
* implementations.
*/
public class HttpRequestFilter extends HttpFilter {
- private final List/*<HttpRequestHandler>*/ handlers = new LinkedList();
+ private final List<HttpRequestHandler> handlers = new LinkedList<HttpRequestHandler>();
public HttpRequestFilter(boolean decodeTransferEncoding) {
super(decodeTransferEncoding);
@@ -35,22 +34,25 @@
handlers.add(handler);
}
+ @Override
protected String processFirstLine(String firstLine) {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- firstLine = ((HttpRequestHandler)it.next()).processRequestLine(firstLine);
+ for (HttpRequestHandler handler : handlers) {
+ firstLine = handler.processRequestLine(firstLine);
}
return firstLine;
}
+ @Override
protected void processHeaders(Headers headers) {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- ((HttpRequestHandler)it.next()).processRequestHeaders(headers);
+ for (HttpRequestHandler handler : handlers) {
+ handler.processRequestHeaders(headers);
}
}
+ @Override
protected void completed() {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- ((HttpRequestHandler)it.next()).requestCompleted();
+ for (HttpRequestHandler handler : handlers) {
+ handler.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=782160&r1=782159&r2=782160&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 Fri Jun 5 23:02:01 2009
@@ -16,7 +16,6 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -25,7 +24,7 @@
* implementations.
*/
public class HttpResponseFilter extends HttpFilter {
- private final List/*<HttpResponseHandler>*/ handlers = new LinkedList();
+ private final List<HttpResponseHandler> handlers = new LinkedList<HttpResponseHandler>();
public HttpResponseFilter(boolean decodeTransferEncoding) {
super(decodeTransferEncoding);
@@ -35,22 +34,25 @@
handlers.add(handler);
}
+ @Override
protected String processFirstLine(String firstLine) {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- firstLine = ((HttpResponseHandler)it.next()).processResponseLine(firstLine);
+ for (HttpResponseHandler handler : handlers) {
+ firstLine = handler.processResponseLine(firstLine);
}
return firstLine;
}
+ @Override
protected void processHeaders(Headers headers) {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- ((HttpResponseHandler)it.next()).processResponseHeaders(headers);
+ for (HttpResponseHandler handler : handlers) {
+ handler.processResponseHeaders(headers);
}
}
+ @Override
protected void completed() {
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- ((HttpResponseHandler)it.next()).responseCompleted();
+ for (HttpResponseHandler handler : handlers) {
+ handler.responseCompleted();
}
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/IdentityEncoder.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/IdentityEncoder.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/IdentityEncoder.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/IdentityEncoder.java Fri Jun 5 23:02:01 2009
@@ -18,7 +18,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Iterator;
import org.apache.ws.commons.tcpmon.core.filter.HeaderParser;
import org.apache.ws.commons.tcpmon.core.filter.Stream;
@@ -45,8 +44,7 @@
byte[] data = buffer.toByteArray();
headers.set("Content-Length", String.valueOf(data.length));
HeaderParser p = new HeaderParser(stream);
- for (Iterator it = headers.iterator(); it.hasNext(); ) {
- Header header = (Header)it.next();
+ for (Header header : headers) {
p.insert(header.getName(), header.getValue());
}
StreamUtil.insertAsciiString(stream, "\r\n");
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/mime/ChainedContentFilterFactory.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/mime/ChainedContentFilterFactory.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/mime/ChainedContentFilterFactory.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/mime/ChainedContentFilterFactory.java Fri Jun 5 23:02:01 2009
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.List;
import javax.activation.MimeType;
@@ -26,7 +25,7 @@
import org.apache.ws.commons.tcpmon.core.filter.StreamFilter;
public class ChainedContentFilterFactory implements ContentFilterFactory {
- private final List/*<ContentFilterFactory>*/ factories = new ArrayList(5);
+ private final List<ContentFilterFactory> factories = new ArrayList<ContentFilterFactory>(5);
public void add(ContentFilterFactory factory) {
factories.add(factory);
@@ -36,16 +35,16 @@
if (factories.isEmpty()) {
return null;
} else if (factories.size() == 1) {
- return ((ContentFilterFactory)factories.get(0)).getContentFilterChain(contentType);
+ return factories.get(0).getContentFilterChain(contentType);
} else {
- List filters = new ArrayList(5);
- for (Iterator it = factories.iterator(); it.hasNext(); ) {
- StreamFilter[] f = ((ContentFilterFactory)it.next()).getContentFilterChain(contentType);
+ List<StreamFilter> filters = new ArrayList<StreamFilter>(5);
+ for (ContentFilterFactory factory : factories) {
+ StreamFilter[] f = factory.getContentFilterChain(contentType);
if (f != null) {
filters.addAll(Arrays.asList(f));
}
}
- return filters.isEmpty() ? null : (StreamFilter[])filters.toArray(new StreamFilter[filters.size()]);
+ return filters.isEmpty() ? null : filters.toArray(new StreamFilter[filters.size()]);
}
}
}
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=782160&r1=782159&r2=782160&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 Fri Jun 5 23:02:01 2009
@@ -85,6 +85,7 @@
public OutputStream getRequestOutputStream() {
Pipeline pipeline = new Pipeline();
pipeline.addFilter(new RequestLineExtractor(50) {
+ @Override
protected void done(String requestLine) {
setRequest(requestLine);
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/DefaultContentFilterFactory.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/DefaultContentFilterFactory.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/DefaultContentFilterFactory.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/DefaultContentFilterFactory.java Fri Jun 5 23:02:01 2009
@@ -34,14 +34,14 @@
* Default {@link ContentFilterFactory} implementation.
*/
public class DefaultContentFilterFactory implements ContentFilterFactory {
- private static final Set xmlContentTypes = new HashSet(Arrays.asList(new String[] {
+ private static final Set<String> xmlContentTypes = new HashSet<String>(Arrays.asList(new String[] {
"text/xml", "application/xml", "application/soap+xml", "application/xop+xml" }));
private static final Charset UTF8 = Charset.forName("utf-8");
public StreamFilter[] getContentFilterChain(MimeType contentType) {
String baseType = contentType.getBaseType().toLowerCase();
boolean isXml = xmlContentTypes.contains(baseType);
- List filters = new ArrayList(2);
+ List<StreamFilter> filters = new ArrayList<StreamFilter>(2);
if (isXml || contentType.getPrimaryType().equalsIgnoreCase("text")) {
String charsetName = contentType.getParameter("charset");
if (charsetName != null) {
@@ -54,6 +54,6 @@
if (isXml) {
filters.add(new XmlFormatFilter(3));
}
- return filters.isEmpty() ? null : (StreamFilter[])filters.toArray(new StreamFilter[filters.size()]);
+ return filters.isEmpty() ? null : filters.toArray(new StreamFilter[filters.size()]);
}
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/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/ui/RawSender.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/RawSender.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/ui/RawSender.java Fri Jun 5 23:02:01 2009
@@ -78,6 +78,7 @@
HttpResponseFilter filter = new HttpResponseFilter(false);
pipeline.addFilter(filter);
filter.addHandler(new AbstractHttpResponseHandler() {
+ @Override
public void responseCompleted() {
try {
socket.shutdownInput();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorDirectTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorDirectTest.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorDirectTest.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorDirectTest.java Fri Jun 5 23:02:01 2009
@@ -17,6 +17,7 @@
package org.apache.ws.commons.tcpmon.core.engine;
public class InterceptorDirectTest extends InterceptorTestBase {
+ @Override
protected InterceptorConfiguration buildInterceptorConfiguration() {
InterceptorConfigurationBuilder builder = new InterceptorConfigurationBuilder();
builder.setTargetHost("localhost");
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorProxyTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorProxyTest.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorProxyTest.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorProxyTest.java Fri Jun 5 23:02:01 2009
@@ -17,6 +17,7 @@
package org.apache.ws.commons.tcpmon.core.engine;
public class InterceptorProxyTest extends InterceptorTestBase {
+ @Override
protected InterceptorConfiguration buildInterceptorConfiguration() {
InterceptorConfigurationBuilder builder = new InterceptorConfigurationBuilder();
builder.setProxy(true);
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorTestBase.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorTestBase.java?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorTestBase.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/test/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorTestBase.java Fri Jun 5 23:02:01 2009
@@ -35,6 +35,7 @@
private HttpClient client;
private String baseUri;
+ @Override
protected void setUp() throws Exception {
// Set up server
@@ -54,6 +55,7 @@
baseUri = TestUtil.getBaseUri(config, server);
}
+ @Override
protected void tearDown() throws Exception {
interceptor.halt();
server.stop();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/pom.xml Fri Jun 5 23:02:01 2009
@@ -60,13 +60,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-idea-plugin/pom.xml Fri Jun 5 23:02:01 2009
@@ -48,13 +48,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<executions>
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/pom.xml Fri Jun 5 23:02:01 2009
@@ -48,13 +48,6 @@
</resources>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
<executions>
Modified: webservices/commons/trunk/modules/tcpmon/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/pom.xml?rev=782160&r1=782159&r2=782160&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/pom.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/pom.xml Fri Jun 5 23:02:01 2009
@@ -76,6 +76,13 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-7</version>
<inherited>false</inherited>