From 74a29ac146280a399d88680d187c8dbeb2b85328 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Thu, 9 Jul 2015 13:40:29 +0200
Subject: [PATCH] Renamed 'rx' package to 'reactive'

---
 spring-web-reactive/.gitignore                |  2 ++
 .../io/ByteArrayPublisherInputStream.java     |  4 +--
 .../io/ByteArrayPublisherOutputStream.java    |  4 +--
 .../util/BlockingSignalQueue.java             |  2 +-
 .../{rx => reactive}/util/OnComplete.java     |  2 +-
 .../{rx => reactive}/util/OnError.java        |  2 +-
 .../{rx => reactive}/util/OnNext.java         |  2 +-
 .../{rx => reactive}/util/Signal.java         |  2 +-
 .../servlet => reactive/web}/HttpHandler.java |  2 +-
 .../web/servlet/AsyncContextSynchronizer.java |  2 +-
 .../web/servlet/HttpHandlerServlet.java       |  4 ++-
 .../web/servlet/RequestBodyPublisher.java     |  2 +-
 .../web/servlet/ResponseBodySubscriber.java   | 32 +++++++++----------
 .../io/ByteBufPublisherInputStreamTests.java  |  7 ++--
 .../BlockingByteBufQueuePublisherTests.java   |  2 +-
 .../util/BlockingByteBufQueueTests.java       |  2 +-
 .../web}/CountingHttpHandler.java             |  3 +-
 .../servlet => reactive/web}/EchoHandler.java |  2 +-
 ...HttpHandlerServletIntegrationTestCase.java |  4 +--
 ...tpHandlerServletJettyIntegrationTests.java | 11 +++++--
 ...pHandlerServletTomcatIntegrationTests.java | 10 +++++-
 21 files changed, 60 insertions(+), 43 deletions(-)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/io/ByteArrayPublisherInputStream.java (96%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/io/ByteArrayPublisherOutputStream.java (91%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/util/BlockingSignalQueue.java (99%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/util/OnComplete.java (96%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/util/OnError.java (96%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/util/OnNext.java (96%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/util/Signal.java (94%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx/web/servlet => reactive/web}/HttpHandler.java (94%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/web/servlet/AsyncContextSynchronizer.java (97%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/web/servlet/HttpHandlerServlet.java (94%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/web/servlet/RequestBodyPublisher.java (98%)
 rename spring-web-reactive/src/main/java/org/springframework/{rx => reactive}/web/servlet/ResponseBodySubscriber.java (82%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/io/ByteBufPublisherInputStreamTests.java (91%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/util/BlockingByteBufQueuePublisherTests.java (99%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/util/BlockingByteBufQueueTests.java (97%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx/web/servlet => reactive/web}/CountingHttpHandler.java (96%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx/web/servlet => reactive/web}/EchoHandler.java (95%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java (96%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/web/servlet/HttpHandlerServletJettyIntegrationTests.java (87%)
 rename spring-web-reactive/src/test/java/org/springframework/{rx => reactive}/web/servlet/HttpHandlerServletTomcatIntegrationTests.java (85%)

diff --git a/spring-web-reactive/.gitignore b/spring-web-reactive/.gitignore
index 8591e43e73..207211d54c 100644
--- a/spring-web-reactive/.gitignore
+++ b/spring-web-reactive/.gitignore
@@ -6,3 +6,5 @@ target
 /.idea/
 bin
 .gradle
+tomcat*
+build
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherInputStream.java b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java
similarity index 96%
rename from spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherInputStream.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java
index 3f5b882f44..03b81aafa3 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherInputStream.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java
@@ -1,4 +1,4 @@
-package org.springframework.rx.io;/*
+package org.springframework.reactive.io;/*
  * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@ import java.io.InputStream;
 
 import org.reactivestreams.Publisher;
 
-import org.springframework.rx.util.BlockingSignalQueue;
+import org.springframework.reactive.util.BlockingSignalQueue;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherOutputStream.java b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java
similarity index 91%
rename from spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherOutputStream.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java
index 80550a43c1..beda227f88 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/io/ByteArrayPublisherOutputStream.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java
@@ -1,4 +1,4 @@
-package org.springframework.rx.io;
+package org.springframework.reactive.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -6,7 +6,7 @@ import java.util.Arrays;
 
 import org.reactivestreams.Publisher;
 
-import org.springframework.rx.util.BlockingSignalQueue;
+import org.springframework.reactive.util.BlockingSignalQueue;
 
 /**
  * {@code OutputStream} implementation that stores all written bytes, to be retrieved
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/util/BlockingSignalQueue.java b/spring-web-reactive/src/main/java/org/springframework/reactive/util/BlockingSignalQueue.java
similarity index 99%
rename from spring-web-reactive/src/main/java/org/springframework/rx/util/BlockingSignalQueue.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/util/BlockingSignalQueue.java
index 890dc89eb6..1b854ff674 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/util/BlockingSignalQueue.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/util/BlockingSignalQueue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnComplete.java b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnComplete.java
similarity index 96%
rename from spring-web-reactive/src/main/java/org/springframework/rx/util/OnComplete.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/util/OnComplete.java
index 74e1cccc10..47aeb326a8 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnComplete.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnComplete.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnError.java b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnError.java
similarity index 96%
rename from spring-web-reactive/src/main/java/org/springframework/rx/util/OnError.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/util/OnError.java
index 250e6f7727..0286ac06a1 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnError.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnError.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnNext.java b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnNext.java
similarity index 96%
rename from spring-web-reactive/src/main/java/org/springframework/rx/util/OnNext.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/util/OnNext.java
index 6d1aa6d8ca..f8e48e4b65 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/util/OnNext.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/util/OnNext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 import org.springframework.util.Assert;
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/util/Signal.java b/spring-web-reactive/src/main/java/org/springframework/reactive/util/Signal.java
similarity index 94%
rename from spring-web-reactive/src/main/java/org/springframework/rx/util/Signal.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/util/Signal.java
index 74ea5eacac..a0cb153e6e 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/util/Signal.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/util/Signal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java
similarity index 94%
rename from spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandler.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java
index e9a3686959..e1e0aac26a 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/HttpHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web;
 
 import org.reactivestreams.Publisher;
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/AsyncContextSynchronizer.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java
similarity index 97%
rename from spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/AsyncContextSynchronizer.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java
index 20be9c51b8..80882923fa 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/AsyncContextSynchronizer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/AsyncContextSynchronizer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandlerServlet.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java
similarity index 94%
rename from spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandlerServlet.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java
index f19d380314..af5f10f172 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/HttpHandlerServlet.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/HttpHandlerServlet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.io.IOException;
 import javax.servlet.AsyncContext;
@@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.reactivestreams.Publisher;
 
+import org.springframework.reactive.web.HttpHandler;
+
 /**
  * @author Arjen Poutsma
  */
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/RequestBodyPublisher.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java
similarity index 98%
rename from spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/RequestBodyPublisher.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java
index 6022922c83..24f28b7bff 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/RequestBodyPublisher.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/RequestBodyPublisher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
diff --git a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/ResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java
similarity index 82%
rename from spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/ResponseBodySubscriber.java
rename to spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java
index f7faa4b16a..c4a6eefd37 100644
--- a/spring-web-reactive/src/main/java/org/springframework/rx/web/servlet/ResponseBodySubscriber.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/servlet/ResponseBodySubscriber.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.WriteListener;
 
@@ -41,7 +40,7 @@ public class ResponseBodySubscriber implements WriteListener, Subscriber<byte[]>
 
 	private byte[] buffer;
 
-	private AtomicBoolean complete = new AtomicBoolean(false);
+	private volatile boolean subscriberComplete = false;
 
 	public ResponseBodySubscriber(AsyncContextSynchronizer synchronizer) {
 		this.synchronizer = synchronizer;
@@ -72,7 +71,9 @@ public class ResponseBodySubscriber implements WriteListener, Subscriber<byte[]>
 	public void onComplete() {
 		logger.debug("Complete buffer: " + (buffer == null));
 
-		if (complete.compareAndSet(false, true) && buffer == null) {
+		this.subscriberComplete = true;
+
+		if (buffer == null) {
 			this.synchronizer.writeComplete();
 		}
 	}
@@ -84,20 +85,22 @@ public class ResponseBodySubscriber implements WriteListener, Subscriber<byte[]>
 		boolean ready = output.isReady();
 		logger.debug("Output: " + ready + " buffer: " + (buffer == null));
 
-		if (this.buffer != null && ready) {
-			output.write(this.buffer);
-			this.buffer = null;
+		if (ready) {
+			if (this.buffer != null) {
+				output.write(this.buffer);
+				this.buffer = null;
 
-			if (!complete.get()) {
-				this.subscription.request(1);
+				if (!subscriberComplete) {
+					this.subscription.request(1);
+				}
+				else {
+					this.synchronizer.writeComplete();
+				}
 			}
 			else {
-				this.synchronizer.writeComplete();
+				this.subscription.request(1);
 			}
 		}
-		else if (this.buffer == null && ready) {
-			this.subscription.request(1);
-		}
 	}
 
 	@Override
@@ -105,7 +108,4 @@ public class ResponseBodySubscriber implements WriteListener, Subscriber<byte[]>
 		logger.error("ResponseBodySubscriber error", t);
 	}
 
-
-	private void complete() {
-	}
 }
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/io/ByteBufPublisherInputStreamTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java
similarity index 91%
rename from spring-web-reactive/src/test/java/org/springframework/rx/io/ByteBufPublisherInputStreamTests.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java
index cd8fa33ddf..45ae841646 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/io/ByteBufPublisherInputStreamTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.io;
+package org.springframework.reactive.io;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.rx.util.BlockingSignalQueue;
+import org.springframework.reactive.util.BlockingSignalQueue;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Arjen Poutsma
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueuePublisherTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueuePublisherTests.java
similarity index 99%
rename from spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueuePublisherTests.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueuePublisherTests.java
index b09781b107..6db97850ee 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueuePublisherTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueuePublisherTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueueTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueueTests.java
similarity index 97%
rename from spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueueTests.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueueTests.java
index 3148d7df56..a04b618487 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueueTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueueTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.util;
+package org.springframework.reactive.util;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/CountingHttpHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java
similarity index 96%
rename from spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/CountingHttpHandler.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java
index 962fd7be68..de6bd16d4f 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/CountingHttpHandler.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,6 @@ public class CountingHttpHandler implements HttpHandler {
 			@Override
 			public void onError(Throwable t) {
 				logger.error("CountingHttpHandler Error", t);
-				t.printStackTrace();
 			}
 
 			@Override
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java
similarity index 95%
rename from spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/EchoHandler.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java
index faf728b0f1..e554623144 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/EchoHandler.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web;
 
 import org.reactivestreams.Publisher;
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
similarity index 96%
rename from spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
index 50e009b297..6088296dd1 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.net.URI;
 import java.util.Random;
@@ -62,7 +62,7 @@ public abstract class AbstractHttpHandlerServletIntegrationTestCase {
 		assertEquals(body, response.getBody());
 	}
 
-	private static String url() {
+	protected static String url() {
 		return "http://localhost:" + port + "/rx";
 	}
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletJettyIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletJettyIntegrationTests.java
similarity index 87%
rename from spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletJettyIntegrationTests.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletJettyIntegrationTests.java
index be3ef6f52f..e52696476e 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletJettyIntegrationTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletJettyIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -23,7 +23,7 @@ import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-import org.springframework.util.SocketUtils;
+import org.springframework.reactive.web.EchoHandler;
 
 /**
  * @author Arjen Poutsma
@@ -37,7 +37,6 @@ public class HttpHandlerServletJettyIntegrationTests
 	public static void startServer() throws Exception {
 		jettyServer = new Server();
 		ServerConnector connector = new ServerConnector(jettyServer);
-		port = SocketUtils.findAvailableTcpPort();
 		connector.setPort(port);
 		ServletContextHandler handler = new ServletContextHandler(jettyServer, "", false, false);
 		HttpHandlerServlet servlet = new HttpHandlerServlet();
@@ -53,4 +52,10 @@ public class HttpHandlerServletJettyIntegrationTests
 		jettyServer.stop();
 	}
 
+	public static void main(String[] args) throws Exception {
+		startServer();
+		System.out.println("Jetty running at: " + url());
+
+	}
+
 }
\ No newline at end of file
diff --git a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletTomcatIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
similarity index 85%
rename from spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
rename to spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
index a9d07171b6..36b1ca8e53 100644
--- a/spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.rx.web.servlet;
+package org.springframework.reactive.web.servlet;
 
 import java.io.File;
 
@@ -24,6 +24,8 @@ import org.apache.catalina.startup.Tomcat;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
+import org.springframework.reactive.web.EchoHandler;
+
 /**
  * @author Arjen Poutsma
  */
@@ -52,4 +54,10 @@ public class HttpHandlerServletTomcatIntegrationTests extends AbstractHttpHandle
 		tomcatServer.stop();
 	}
 
+	public static void main(String[] args) throws Exception {
+		startServer();
+		System.out.println("Tomcat running at: " + url());
+		tomcatServer.getServer().await();
+	}
+
 }
\ No newline at end of file