You are viewing a plain text version of this content. The canonical link for it is here.
Posted to awf-commits@incubator.apache.org by jm...@apache.org on 2011/08/04 18:35:54 UTC
svn commit: r1153959 [3/3] - in /incubator/deft/sandbox: ./
src/main/java/org/apache/ src/main/java/org/apache/deft/
src/main/java/org/apache/deft/annotation/
src/main/java/org/apache/deft/configuration/
src/main/java/org/apache/deft/example/ src/main/...
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/util/HttpRequestHelper.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/util/HttpRequestHelper.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/util/HttpRequestHelper.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/util/HttpRequestHelper.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import java.nio.ByteBuffer;
import java.util.Collection;
@@ -28,147 +28,138 @@ import com.google.common.collect.HashMul
import com.google.common.collect.Multimap;
/**
- * This class can be used to create HttpRequests (and corresponding byte representations)
+ * This class can be used to create HttpRequests (and corresponding byte
+ * representations)
*/
public class HttpRequestHelper {
-
-//Default request will look like this:
-/*
-GET / HTTP/1.0
-Host: localhost:8080
-User-Agent: Mozilla/5.0
-From: abcde@qwert.com
- */
-
- enum ParameterDelimMode {
- AMPERSAND,
- SEMICOLON,
- MIXED
- }
-
- private ParameterDelimMode paramDelimMode = ParameterDelimMode.MIXED;
-
- private String protocol = "HTTP";
- private String method = "GET";
- private String version = "1.1";
- private String requestedPath = "/";
- private Map<String, String> headers = new HashMap<String, String>();
- private Multimap<String, String> getParameters = HashMultimap.create();
-
- public HttpRequestHelper() {
- headers.put("Host", "localhost:8080");
- headers.put("User-Agent", "Mozilla/5.0");
- headers.put("From", "abcde@qwert.com");
- }
-
-
- public String getRequestAsString() {
- String requestLine = createRequestLine();
- String headerString = createHeaders();
- //TODO Body
- String request = requestLine + headerString;
- return request;
- }
-
-
- public byte[] getRequestAsBytes() {
- String request = getRequestAsString();
- return request.getBytes();
- }
-
- public ByteBuffer getRequestAsByteBuffer() {
- return ByteBuffer.wrap(getRequestAsBytes());
- }
-
- public String addHeader(String name, String value) {
- return headers.put(name, value);
- }
-
- public String removeHeader(String name) {
- return headers.remove(name);
- }
-
- public boolean addGetParameter(String name, String value) {
- return getParameters.put(name, value);
- }
-
- public void setRequestedPath(String path) {
- requestedPath = path;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public void setParameterDelimMode(ParameterDelimMode mode) {
- paramDelimMode = mode;
- }
-
- private String getParameterDelimiter() {
- String delim;
- switch (paramDelimMode) {
- case AMPERSAND :
- delim = "&";
- break;
- case SEMICOLON :
- delim = ";";
- break;
- case MIXED:
- if (Math.random() > 0.5) {
- delim ="&";
- }
- else {
- delim = ";";
- }
- break;
- default :
- delim = ";";
- }
- return delim;
- }
-
-
- /**
- * Creates the initial request line, i.e:
- * GET / HTTP/1.0
- *
- * It also add \r\n to the end of the line
- */
- private String createRequestLine() {
- String requestedPathWithParams = requestedPath;
-
- if (!getParameters.isEmpty()) { //Add get parameters
- requestedPathWithParams += "?";
- for (String paramName : getParameters.keySet()) {
- String delimiter = getParameterDelimiter();
- Collection<String> values = getParameters.get(paramName);
- for (String value : values) { //A single param can have multiple values
- String val = value == null? "" : value;
- requestedPathWithParams += paramName + "=" + val + delimiter;
- }
- }
- //Remove last &
- requestedPathWithParams = requestedPathWithParams.substring(0, requestedPathWithParams.length()-1);
- }
- String reqLine = method + " " + requestedPathWithParams + " " + protocol + "/" + version + "\r\n";
- return reqLine;
- }
-
- /**
- * Creates the header lines, i.e:
- * Host: localhost:8080
- * User-Agent: Mozilla/5.0
- * From: abcde@qwert.com
- *
- * It also add \r\n to the end of the line
- */
- private String createHeaders() {
- String result = "";
- for(String headerKey : headers.keySet()) {
- String headerValue = headers.get(headerKey);
- result += headerKey + ": " + headerValue + "\r\n";
- }
- result += "\r\n";
- return result;
- }
+
+ // Default request will look like this:
+ /*
+ * GET / HTTP/1.0 Host: localhost:8080 User-Agent: Mozilla/5.0 From:
+ * abcde@qwert.com
+ */
+
+ enum ParameterDelimMode {
+ AMPERSAND, SEMICOLON, MIXED
+ }
+
+ private ParameterDelimMode paramDelimMode = ParameterDelimMode.MIXED;
+
+ private String protocol = "HTTP";
+ private String method = "GET";
+ private String version = "1.1";
+ private String requestedPath = "/";
+ private Map<String, String> headers = new HashMap<String, String>();
+ private Multimap<String, String> getParameters = HashMultimap.create();
+
+ public HttpRequestHelper() {
+ headers.put("Host", "localhost:8080");
+ headers.put("User-Agent", "Mozilla/5.0");
+ headers.put("From", "abcde@qwert.com");
+ }
+
+ public String getRequestAsString() {
+ String requestLine = createRequestLine();
+ String headerString = createHeaders();
+ // TODO Body
+ String request = requestLine + headerString;
+ return request;
+ }
+
+ public byte[] getRequestAsBytes() {
+ String request = getRequestAsString();
+ return request.getBytes();
+ }
+
+ public ByteBuffer getRequestAsByteBuffer() {
+ return ByteBuffer.wrap(getRequestAsBytes());
+ }
+
+ public String addHeader(String name, String value) {
+ return headers.put(name, value);
+ }
+
+ public String removeHeader(String name) {
+ return headers.remove(name);
+ }
+
+ public boolean addGetParameter(String name, String value) {
+ return getParameters.put(name, value);
+ }
+
+ public void setRequestedPath(String path) {
+ requestedPath = path;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public void setParameterDelimMode(ParameterDelimMode mode) {
+ paramDelimMode = mode;
+ }
+
+ private String getParameterDelimiter() {
+ String delim;
+ switch (paramDelimMode) {
+ case AMPERSAND:
+ delim = "&";
+ break;
+ case SEMICOLON:
+ delim = ";";
+ break;
+ case MIXED:
+ if (Math.random() > 0.5) {
+ delim = "&";
+ } else {
+ delim = ";";
+ }
+ break;
+ default:
+ delim = ";";
+ }
+ return delim;
+ }
+
+ /**
+ * Creates the initial request line, i.e: GET / HTTP/1.0
+ *
+ * It also add \r\n to the end of the line
+ */
+ private String createRequestLine() {
+ String requestedPathWithParams = requestedPath;
+
+ if (!getParameters.isEmpty()) { // Add get parameters
+ requestedPathWithParams += "?";
+ for (String paramName : getParameters.keySet()) {
+ String delimiter = getParameterDelimiter();
+ Collection<String> values = getParameters.get(paramName);
+ for (String value : values) { // A single param can have
+ // multiple values
+ String val = value == null ? "" : value;
+ requestedPathWithParams += paramName + "=" + val + delimiter;
+ }
+ }
+ // Remove last &
+ requestedPathWithParams = requestedPathWithParams.substring(0, requestedPathWithParams.length() - 1);
+ }
+ String reqLine = method + " " + requestedPathWithParams + " " + protocol + "/" + version + "\r\n";
+ return reqLine;
+ }
+
+ /**
+ * Creates the header lines, i.e: Host: localhost:8080 User-Agent:
+ * Mozilla/5.0 From: abcde@qwert.com
+ *
+ * It also add \r\n to the end of the line
+ */
+ private String createHeaders() {
+ String result = "";
+ for (String headerKey : headers.keySet()) {
+ String headerValue = headers.get(headerKey);
+ result += headerKey + ": " + headerValue + "\r\n";
+ }
+ result += "\r\n";
+ return result;
+ }
}
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/util/ReflectionToolsTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/util/ReflectionToolsTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/util/ReflectionToolsTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/util/ReflectionToolsTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/util/UrlUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/util/UrlUtilTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/util/UrlUtilTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/util/UrlUtilTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import static org.junit.Assert.assertEquals;
@@ -28,11 +28,11 @@ import org.junit.Test;
public class UrlUtilTest {
- @Test
- public void urlJoinTest() throws MalformedURLException {
- assertEquals("http://tt.se/start/", UrlUtil.urlJoin(new URL("http://tt.se/"), "/start/"));
- assertEquals("http://localhost.com/", UrlUtil.urlJoin(new URL("http://localhost.com/moved_perm"), "/"));
- assertEquals("https://github.com/", UrlUtil.urlJoin(new URL("http://github.com/"), "https://github.com/"));
- }
-
+ @Test
+ public void urlJoinTest() throws MalformedURLException {
+ assertEquals("http://tt.se/start/", UrlUtil.urlJoin(new URL("http://tt.se/"), "/start/"));
+ assertEquals("http://localhost.com/", UrlUtil.urlJoin(new URL("http://localhost.com/moved_perm"), "/"));
+ assertEquals("https://github.com/", UrlUtil.urlJoin(new URL("http://github.com/"), "https://github.com/"));
+ }
+
}
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/ApplicationTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/ApplicationTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/ApplicationTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/ApplicationTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/ApplicationTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/ApplicationTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/ApplicationTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,12 +26,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.regex.PatternSyntaxException;
-import org.deftserver.web.handler.BadRequestRequestHandler;
-import org.deftserver.web.handler.NotFoundRequestHandler;
-import org.deftserver.web.handler.RequestHandler;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpRequestImpl;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.web.handler.BadRequestRequestHandler;
+import org.apache.deft.web.handler.NotFoundRequestHandler;
+import org.apache.deft.web.handler.RequestHandler;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpRequestImpl;
+import org.apache.deft.web.http.HttpResponse;
import org.junit.Test;
public class ApplicationTest {
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/DeftSystemTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/DeftSystemTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/DeftSystemTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/DeftSystemTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/DeftSystemTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/DeftSystemTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/DeftSystemTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -43,6 +43,15 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.deft.configuration.Configuration;
+import org.apache.deft.example.keyvalue.KeyValueStore;
+import org.apache.deft.example.keyvalue.KeyValueStoreClient;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.io.timeout.Timeout;
+import org.apache.deft.web.handler.RequestHandler;
+import org.apache.deft.web.http.HttpException;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.client.AsynchronousHttpClient;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.ProtocolVersion;
@@ -58,15 +67,6 @@ import org.apache.http.message.BasicHead
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-import org.deftserver.configuration.Configuration;
-import org.deftserver.example.keyvalue.KeyValueStore;
-import org.deftserver.example.keyvalue.KeyValueStoreClient;
-import org.deftserver.io.IOLoop;
-import org.deftserver.io.timeout.Timeout;
-import org.deftserver.web.handler.RequestHandler;
-import org.deftserver.web.http.HttpException;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.client.AsynchronousHttpClient;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -83,21 +83,21 @@ public class DeftSystemTest {
private static class ExampleRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(expectedPayload);
}
}
private static class WRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("1");
}
}
private static class WWRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("1");
response.write("2");
}
@@ -105,7 +105,7 @@ public class DeftSystemTest {
private static class WWFWRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("1");
response.write("2");
response.flush();
@@ -115,7 +115,7 @@ public class DeftSystemTest {
private static class WFWFRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("1");
response.flush();
response.write("2");
@@ -125,7 +125,7 @@ public class DeftSystemTest {
private static class WFFFWFFFRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("1");
response.flush();
response.flush();
@@ -139,7 +139,7 @@ public class DeftSystemTest {
private static class DeleteRequestHandler extends RequestHandler {
@Override
- public void delete(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void delete(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("del");
response.flush();
response.write("ete");
@@ -149,7 +149,7 @@ public class DeftSystemTest {
private static class PostRequestHandler extends RequestHandler {
@Override
- public void post(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void post(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("po");
response.flush();
response.write("st");
@@ -159,7 +159,7 @@ public class DeftSystemTest {
private static class PutRequestHandler extends RequestHandler {
@Override
- public void put(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void put(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write("p");
response.flush();
response.write("ut");
@@ -169,14 +169,14 @@ public class DeftSystemTest {
private static class CapturingRequestRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(request.getRequestedPath());
}
}
private static class ThrowingHttpExceptionRequestHandler extends RequestHandler {
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
throw new HttpException(500, "exception message");
}
}
@@ -184,21 +184,21 @@ public class DeftSystemTest {
private static class AsyncThrowingHttpExceptionRequestHandler extends RequestHandler {
@Asynchronous
@Override
- public void get(org.deftserver.web.http.HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(org.apache.deft.web.http.HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
throw new HttpException(500, "exception message");
}
}
public static class NoBodyRequestHandler extends RequestHandler {
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.setStatusCode(200);
}
}
public static class MovedPermanentlyRequestHandler extends RequestHandler {
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.setStatusCode(301);
response.setHeader("Location", "/");
}
@@ -206,7 +206,7 @@ public class DeftSystemTest {
public static class UserDefinedStaticContentHandler extends RequestHandler {
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(new File("src/test/resources/test.txt"));
}
}
@@ -222,7 +222,7 @@ public class DeftSystemTest {
@Override
@Asynchronous
- public void get(HttpRequest request, final org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, final org.apache.deft.web.http.HttpResponse response) {
client.get("deft", new AsyncResult<byte[]>() {
@Override
public void onFailure(Throwable caught) { /* ignore */
@@ -250,14 +250,14 @@ public class DeftSystemTest {
}
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(entity);
}
}
public static class EchoingPostBodyRequestHandler extends RequestHandler {
@Override
- public void post(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void post(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(request.getBody());
}
}
@@ -265,7 +265,7 @@ public class DeftSystemTest {
public static class AuthenticatedRequestHandler extends RequestHandler {
@Override
@Authenticated
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(request.getHeader("user"));
}
@@ -277,14 +277,14 @@ public class DeftSystemTest {
private static class QueryParamsRequestHandler extends RequestHandler {
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.write(request.getParameter("key1") + " " + request.getParameter("key2"));
}
}
private static class ChunkedRequestHandler extends RequestHandler {
@Override
- public void get(HttpRequest request, org.deftserver.web.http.HttpResponse response) {
+ public void get(HttpRequest request, org.apache.deft.web.http.HttpResponse response) {
response.setHeader("Transfer-Encoding", "chunked");
sleep(300);
@@ -1162,9 +1162,9 @@ public class DeftSystemTest {
final AsyncCallback runByIOLoop = new AsyncCallback() {
public void onCallback() {
- client.get(unresolvableAddress, new AsyncResult<org.deftserver.web.http.client.Response>() {
+ client.get(unresolvableAddress, new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response result) {
+ public void onSuccess(org.apache.deft.web.http.client.Response result) {
client.close();
}
@@ -1191,9 +1191,9 @@ public class DeftSystemTest {
final AsyncCallback runByIOLoop = new AsyncCallback() {
public void onCallback() {
- client.get(unconnectableAddress, new AsyncResult<org.deftserver.web.http.client.Response>() {
+ client.get(unconnectableAddress, new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response result) {
+ public void onSuccess(org.apache.deft.web.http.client.Response result) {
client.close();
}
@@ -1219,9 +1219,9 @@ public class DeftSystemTest {
final String url = "http://localhost:" + PORT + "/";
final AsynchronousHttpClient http = new AsynchronousHttpClient();
final String[] result = { "BODY_PLACEHOLDER", "STATUSCODE_PLACEHOLDER" };
- final AsyncResult<org.deftserver.web.http.client.Response> cb = new AsyncResult<org.deftserver.web.http.client.Response>() {
+ final AsyncResult<org.apache.deft.web.http.client.Response> cb = new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response response) {
+ public void onSuccess(org.apache.deft.web.http.client.Response response) {
result[0] = response.getBody();
result[1] = response.getStatusLine();
latch.countDown();
@@ -1249,9 +1249,9 @@ public class DeftSystemTest {
final CountDownLatch latch = new CountDownLatch(1);
final String url = "http://localhost:" + (PORT + 1) + "/";
final AsynchronousHttpClient http = new AsynchronousHttpClient();
- final AsyncResult<org.deftserver.web.http.client.Response> cb = new AsyncResult<org.deftserver.web.http.client.Response>() {
+ final AsyncResult<org.apache.deft.web.http.client.Response> cb = new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response response) {
+ public void onSuccess(org.apache.deft.web.http.client.Response response) {
}
public void onFailure(Throwable e) {
@@ -1276,9 +1276,9 @@ public class DeftSystemTest {
// final String url = "http://localhost:" + (PORT) + "/moved_perm";
final String url = "http://localhost:" + PORT + "/moved_perm";
final AsynchronousHttpClient http = new AsynchronousHttpClient();
- final AsyncResult<org.deftserver.web.http.client.Response> cb = new AsyncResult<org.deftserver.web.http.client.Response>() {
+ final AsyncResult<org.apache.deft.web.http.client.Response> cb = new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response response) {
+ public void onSuccess(org.apache.deft.web.http.client.Response response) {
if (response.getBody().equals(expectedPayload)) {
latch.countDown();
}
@@ -1303,9 +1303,9 @@ public class DeftSystemTest {
final CountDownLatch latch = new CountDownLatch(1);
final String url = "http://localhost:" + PORT + "/chunked";
final AsynchronousHttpClient http = new AsynchronousHttpClient();
- final AsyncResult<org.deftserver.web.http.client.Response> cb = new AsyncResult<org.deftserver.web.http.client.Response>() {
+ final AsyncResult<org.apache.deft.web.http.client.Response> cb = new AsyncResult<org.apache.deft.web.http.client.Response>() {
- public void onSuccess(org.deftserver.web.http.client.Response response) {
+ public void onSuccess(org.apache.deft.web.http.client.Response response) {
if (response.getBody().equals("arogerab") && response.getHeader("Transfer-Encoding").equals("chunked")) {
latch.countDown();
}
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpServerTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpServerTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpServerTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpServerTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpServerTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpServerTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpServerTest.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
-import org.deftserver.configuration.Configuration;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.configuration.Configuration;
+import org.apache.deft.web.handler.RequestHandler;
import org.junit.Test;
import com.google.common.collect.Maps;
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpVerbTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpVerbTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpVerbTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpVerbTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpVerbTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/HttpVerbTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/HttpVerbTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import static org.junit.Assert.assertEquals;
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/web/handler/RequestHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/handler/RequestHandlerTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/web/handler/RequestHandlerTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/handler/RequestHandlerTest.java Thu Aug 4 18:35:27 2011
@@ -17,16 +17,17 @@
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.deftserver.web.Asynchronous;
-import org.deftserver.web.Authenticated;
-import org.deftserver.web.HttpVerb;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.web.Asynchronous;
+import org.apache.deft.web.Authenticated;
+import org.apache.deft.web.HttpVerb;
+import org.apache.deft.web.handler.RequestHandler;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
import org.junit.Test;
public class RequestHandlerTest {
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/ContentTypeTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/http/ContentTypeTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/ContentTypeTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/ContentTypeTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/http/ContentTypeTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/http/ContentTypeTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/ContentTypeTest.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,11 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
import static org.junit.Assert.assertTrue;
+import org.apache.deft.web.http.ContentType;
import org.junit.Test;
/**
@@ -29,7 +30,7 @@ import org.junit.Test;
public class ContentTypeTest {
@Test
- public void testname() throws Exception {
+ public void test() throws Exception {
assertTrue("No functionality in class to test.", true);
}
}
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/HttpRequestImplTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/web/http/HttpRequestTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/HttpRequestImplTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/HttpRequestImplTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/web/http/HttpRequestTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/web/http/HttpRequestTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/HttpRequestImplTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -32,13 +32,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.deftserver.util.ArrayUtil;
-import org.deftserver.util.HttpRequestHelper;
-import org.deftserver.util.HttpUtil;
+import org.apache.deft.util.ArrayUtil;
+import org.apache.deft.util.HttpRequestHelper;
+import org.apache.deft.util.HttpUtil;
import org.junit.Assert;
import org.junit.Test;
-public class HttpRequestTest {
+public class HttpRequestImplTest {
@Test
public void testDeserializeHttpGetRequest() {
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/AsynchronousHttpClientTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/AsynchronousHttpClientTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/AsynchronousHttpClientTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/AsynchronousHttpClientTest.java Thu Aug 4 18:35:27 2011
@@ -17,15 +17,17 @@
* under the License.
*
*/
-package org.deftserver.web.http.client;
+package org.apache.deft.web.http.client;
import static org.junit.Assert.*;
-import static org.deftserver.web.http.client.AsynchronousHttpClient.HTTP_VERSION;
-import static org.deftserver.web.http.client.AsynchronousHttpClient.USER_AGENT_HEADER;
-import static org.deftserver.web.http.client.AsynchronousHttpClient.NEWLINE;
-
-import org.deftserver.web.AsyncResult;
-import org.deftserver.web.HttpVerb;
+import static org.apache.deft.web.http.client.AsynchronousHttpClient.HTTP_VERSION;
+import static org.apache.deft.web.http.client.AsynchronousHttpClient.NEWLINE;
+import static org.apache.deft.web.http.client.AsynchronousHttpClient.USER_AGENT_HEADER;
+
+import org.apache.deft.web.AsyncResult;
+import org.apache.deft.web.HttpVerb;
+import org.apache.deft.web.http.client.AsynchronousHttpClient;
+import org.apache.deft.web.http.client.Response;
import org.junit.Test;
/**
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/RequestTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/RequestTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/RequestTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/web/http/client/RequestTest.java Thu Aug 4 18:35:27 2011
@@ -17,15 +17,16 @@
* under the License.
*
*/
-package org.deftserver.web.http.client;
+package org.apache.deft.web.http.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
-import org.deftserver.web.HttpVerb;
-import org.deftserver.web.http.ContentType;
+import org.apache.deft.web.HttpVerb;
+import org.apache.deft.web.http.ContentType;
+import org.apache.deft.web.http.client.Request;
import org.junit.Test;
import com.google.common.base.Charsets;