Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed 'rx' package to 'reactive'

Browse Source
This commit is contained in:
Arjen Poutsma
2015-07-09 13:40:29 +02:00
parent f518d76a77
commit 74a29ac146
21 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web-reactive/src/test/java/org/springframework/rx/io/ByteBufPublisherInputStreamTests.java → spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java
View File

@@ -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

2
spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueuePublisherTests.java → spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueuePublisherTests.java
View File

@@ -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;

2
spring-web-reactive/src/test/java/org/springframework/rx/util/BlockingByteBufQueueTests.java → spring-web-reactive/src/test/java/org/springframework/reactive/util/BlockingByteBufQueueTests.java
View File

@@ -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;

3
spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/CountingHttpHandler.java → spring-web-reactive/src/test/java/org/springframework/reactive/web/CountingHttpHandler.java
View File

@@ -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

2
spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/EchoHandler.java → spring-web-reactive/src/test/java/org/springframework/reactive/web/EchoHandler.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.rx.web.servlet;
package org.springframework.reactive.web;
import org.reactivestreams.Publisher;

4
spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java → spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/AbstractHttpHandlerServletIntegrationTestCase.java
View File

@@ -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";
}

11
spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletJettyIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletJettyIntegrationTests.java
View File

@@ -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());
}
}

10
spring-web-reactive/src/test/java/org/springframework/rx/web/servlet/HttpHandlerServletTomcatIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/reactive/web/servlet/HttpHandlerServletTomcatIntegrationTests.java
View File

@@ -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();
}
}