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 [2/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/main/java/org/apache/deft/io/timeout/Timeout.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/Timeout.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/Timeout.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/Timeout.java Thu Aug 4 18:35:27 2011
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.deftserver.io.timeout;
+package org.apache.deft.io.timeout;
import java.nio.channels.SelectableChannel;
-import org.deftserver.io.IOLoop;
-import org.deftserver.util.Closeables;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.util.Closeables;
+import org.apache.deft.web.AsyncCallback;
public class Timeout {
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManager.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManager.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManager.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManager.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.io.timeout;
+package org.apache.deft.io.timeout;
import java.nio.channels.SelectableChannel;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManagerMXBean.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManagerMXBean.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManagerMXBean.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/io/timeout/TimeoutManagerMXBean.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.io.timeout;
+package org.apache.deft.io.timeout;
public interface TimeoutManagerMXBean {
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/AcceptUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/AcceptUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/AcceptUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/AcceptUtil.java Thu Aug 4 18:35:27 2011
@@ -17,39 +17,41 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import java.io.IOException;
import java.nio.channels.SelectionKey;
import java.nio.channels.ServerSocketChannel;
-import org.deftserver.io.IOHandler;
-import org.deftserver.io.IOLoop;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.IOHandler;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.web.AsyncCallback;
public class AcceptUtil {
- public static void accept(ServerSocketChannel server, final AsyncCallback cb) {
- accept(IOLoop.INSTANCE, server, cb);
- }
-
- public static void accept(IOLoop ioLoop, ServerSocketChannel server, final AsyncCallback cb) {
- ioLoop.addHandler(
- server,
- new AcceptingIOHandler() {public void handleAccept(SelectionKey key) { cb.onCallback(); }},
- SelectionKey.OP_ACCEPT,
- null
- );
- }
-
- private static abstract class AcceptingIOHandler implements IOHandler {
-
- public void handleConnect(SelectionKey key) throws IOException {}
-
- public void handleRead(SelectionKey key) throws IOException {}
-
- public void handleWrite(SelectionKey key) {}
-
- }
+ public static void accept(ServerSocketChannel server, final AsyncCallback cb) {
+ accept(IOLoop.INSTANCE, server, cb);
+ }
+
+ public static void accept(IOLoop ioLoop, ServerSocketChannel server, final AsyncCallback cb) {
+ ioLoop.addHandler(server, new AcceptingIOHandler() {
+ public void handleAccept(SelectionKey key) {
+ cb.onCallback();
+ }
+ }, SelectionKey.OP_ACCEPT, null);
+ }
+
+ private static abstract class AcceptingIOHandler implements IOHandler {
+
+ public void handleConnect(SelectionKey key) throws IOException {
+ }
+
+ public void handleRead(SelectionKey key) throws IOException {
+ }
+
+ public void handleWrite(SelectionKey key) {
+ }
+
+ }
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/ArrayUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/ArrayUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/ArrayUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/ArrayUtil.java Thu Aug 4 18:35:27 2011
@@ -17,27 +17,26 @@
* under the License.
*
*/
-package org.deftserver.util;
-
+package org.apache.deft.util;
public class ArrayUtil {
-// private static final List<String> EMPTY_STRING_LIST = Arrays.asList("");
-// private static final String[] EMPTY_STRING_ARRAY = new String[0];
- public static String[] dropFromEndWhile(String[] array, String regex) {
- for (int i = array.length - 1 ;i >= 0; i--) {
- if (!array[i].trim().equals("")) {
- String[] trimmedArray = new String[i+1];
- System.arraycopy(array, 0, trimmedArray, 0, i+1);
- return trimmedArray;
- }
- }
- return null;
-// { // alternative impl
-// List<String> list = new ArrayList<String>(Arrays.asList(array));
-// list.removeAll(EMPTY_STRING_LIST);
-// return list.toArray(EMPTY_STRING_ARRAY);
-// }
- }
-
+ // private static final List<String> EMPTY_STRING_LIST = Arrays.asList("");
+ // private static final String[] EMPTY_STRING_ARRAY = new String[0];
+ public static String[] dropFromEndWhile(String[] array, String regex) {
+ for (int i = array.length - 1; i >= 0; i--) {
+ if (!array[i].trim().equals("")) {
+ String[] trimmedArray = new String[i + 1];
+ System.arraycopy(array, 0, trimmedArray, 0, i + 1);
+ return trimmedArray;
+ }
+ }
+ return null;
+ // { // alternative impl
+ // List<String> list = new ArrayList<String>(Arrays.asList(array));
+ // list.removeAll(EMPTY_STRING_LIST);
+ // return list.toArray(EMPTY_STRING_ARRAY);
+ // }
+ }
+
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/Closeables.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/Closeables.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/Closeables.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/Closeables.java Thu Aug 4 18:35:27 2011
@@ -17,26 +17,28 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import java.io.IOException;
import java.nio.channels.SelectableChannel;
-import org.deftserver.io.IOLoop;
+import org.apache.deft.io.IOLoop;
public class Closeables {
- private Closeables() {}
+ private Closeables() {
+ }
+
+ public static void closeQuietly(SelectableChannel channel) {
+ closeQuietly(IOLoop.INSTANCE, channel);
+ }
+
+ public static void closeQuietly(IOLoop ioLoop, SelectableChannel channel) {
+ try {
+ ioLoop.removeHandler(channel);
+ com.google.common.io.Closeables.close(channel, true);
+ } catch (IOException ignore) {
+ }
+ }
- public static void closeQuietly(SelectableChannel channel) {
- closeQuietly(IOLoop.INSTANCE, channel);
- }
-
- public static void closeQuietly(IOLoop ioLoop, SelectableChannel channel) {
- try {
- ioLoop.removeHandler(channel);
- com.google.common.io.Closeables.close(channel, true);
- } catch (IOException ignore) { }
- }
-
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/CookieUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/CookieUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/CookieUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/CookieUtil.java Thu Aug 4 18:35:27 2011
@@ -17,22 +17,22 @@
* under the License.
*
*/
-package org.deftserver.util;
-
+package org.apache.deft.util;
/**
* Utility type providing cookie-related functionality.
*/
public class CookieUtil {
- /**
- * Utility method to calculate the expiration date of a cookie, starting with a time of validity in seconds.
- *
- * @param seconds time of validity
- * @return expiry date
- */
- public static String maxAgeToExpires(Long seconds) {
- return DateUtil.parseToRFC1123(System.currentTimeMillis() + (seconds * 1000));
- }
-
+ /**
+ * Utility method to calculate the expiration date of a cookie, starting
+ * with a time of validity in seconds.
+ *
+ * @param seconds time of validity
+ * @return expiry date
+ */
+ public static String maxAgeToExpires(Long seconds) {
+ return DateUtil.parseToRFC1123(System.currentTimeMillis() + seconds * 1000);
+ }
+
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/DateUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/DateUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/DateUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/DateUtil.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.text.DateFormat;
import java.text.ParseException;
@@ -30,85 +30,89 @@ import java.util.regex.Pattern;
public class DateUtil {
- private final static Locale LOCALE = Locale.US;
- private final static TimeZone GMT_ZONE;
- private final static String RFC_1123_PATTERN = "EEE, dd MMM yyyy HH:mm:ss zzz";
- private final static DateFormat RFC_1123_FORMAT;
-
- /** Pattern to find digits only. */
- private final static Pattern DIGIT_PATTERN = Pattern.compile("^\\d+$");
-
- static {
- RFC_1123_FORMAT = new SimpleDateFormat(DateUtil.RFC_1123_PATTERN, DateUtil.LOCALE);
- GMT_ZONE = TimeZone.getTimeZone("GMT");
- DateUtil.RFC_1123_FORMAT.setTimeZone(DateUtil.GMT_ZONE);
- }
-
- public static String getCurrentAsString() {
- return DateUtil.RFC_1123_FORMAT.format(new Date());
- }
-
- /**
- * Translate a given date <code>String</code> in the <em>RFC 1123</em> format to a <code>long</code> representing the number of milliseconds since
- * epoch.
- *
- * @param dateString
- * a date <code>String</code> in the <em>RFC 1123</em> format.
- * @return the parsed <code>Date</code> in milliseconds.
- */
- private static long parseDateStringToMilliseconds(final String dateString) {
-
- try {
- return DateUtil.RFC_1123_FORMAT.parse(dateString).getTime();
- } catch (final ParseException e) {
- return 0;
- }
- }
-
- /**
- * Parse a given date <code>String</code> to a <code>long</code> representation of the time. Where the provided value is all digits the value is
- * returned as a <code>long</code>, otherwise attempt is made to parse the <code>String</code> as a <em>RFC 1123</em> date.
- *
- * @param dateValue
- * the value to parse.
- * @return the <code>long</code> value following parse, or zero where not successful.
- */
- public static long parseToMilliseconds(final String dateValue) {
-
- long ms = 0;
-
- if (DateUtil.DIGIT_PATTERN.matcher(dateValue).matches()) {
- ms = Long.parseLong(dateValue);
- } else {
- ms = parseDateStringToMilliseconds(dateValue);
- }
-
- return ms;
- }
-
- /**
- * Converts a millisecond representation of a date to a <code>RFC 1123</code> formatted <code>String</code>.
- *
- * @param dateValue
- * the <code>Date</code> represented as milliseconds.
- * @return a <code>String</code> representation of the date.
- */
- public static String parseToRFC1123(final long dateValue) {
-
- final Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(dateValue);
-
- return DateUtil.RFC_1123_FORMAT.format(calendar.getTime());
- }
-
- /**
- * Convert a given <code>Date</code> object to a <code>RFC 1123</code> formatted <code>String</code>.
- *
- * @param date the <code>Date</code> object to convert
- * @return a <code>String</code> representation of the date.
- */
- public static String getDateAsString(Date date) {
- return RFC_1123_FORMAT.format(date);
- }
-
-}
\ No newline at end of file
+ private final static Locale LOCALE = Locale.US;
+ private final static TimeZone GMT_ZONE;
+ private final static String RFC_1123_PATTERN = "EEE, dd MMM yyyy HH:mm:ss zzz";
+ private final static DateFormat RFC_1123_FORMAT;
+
+ /** Pattern to find digits only. */
+ private final static Pattern DIGIT_PATTERN = Pattern.compile("^\\d+$");
+
+ static {
+ RFC_1123_FORMAT = new SimpleDateFormat(DateUtil.RFC_1123_PATTERN, DateUtil.LOCALE);
+ GMT_ZONE = TimeZone.getTimeZone("GMT");
+ DateUtil.RFC_1123_FORMAT.setTimeZone(DateUtil.GMT_ZONE);
+ }
+
+ public static String getCurrentAsString() {
+ return DateUtil.RFC_1123_FORMAT.format(new Date());
+ }
+
+ /**
+ * Translate a given date <code>String</code> in the <em>RFC 1123</em>
+ * format to a <code>long</code> representing the number of milliseconds
+ * since epoch.
+ *
+ * @param dateString a date <code>String</code> in the <em>RFC 1123</em>
+ * format.
+ * @return the parsed <code>Date</code> in milliseconds.
+ */
+ private static long parseDateStringToMilliseconds(final String dateString) {
+
+ try {
+ return DateUtil.RFC_1123_FORMAT.parse(dateString).getTime();
+ } catch (final ParseException e) {
+ return 0;
+ }
+ }
+
+ /**
+ * Parse a given date <code>String</code> to a <code>long</code>
+ * representation of the time. Where the provided value is all digits the
+ * value is returned as a <code>long</code>, otherwise attempt is made to
+ * parse the <code>String</code> as a <em>RFC 1123</em> date.
+ *
+ * @param dateValue the value to parse.
+ * @return the <code>long</code> value following parse, or zero where not
+ * successful.
+ */
+ public static long parseToMilliseconds(final String dateValue) {
+
+ long ms = 0;
+
+ if (DateUtil.DIGIT_PATTERN.matcher(dateValue).matches()) {
+ ms = Long.parseLong(dateValue);
+ } else {
+ ms = parseDateStringToMilliseconds(dateValue);
+ }
+
+ return ms;
+ }
+
+ /**
+ * Converts a millisecond representation of a date to a
+ * <code>RFC 1123</code> formatted <code>String</code>.
+ *
+ * @param dateValue the <code>Date</code> represented as milliseconds.
+ * @return a <code>String</code> representation of the date.
+ */
+ public static String parseToRFC1123(final long dateValue) {
+
+ final Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(dateValue);
+
+ return DateUtil.RFC_1123_FORMAT.format(calendar.getTime());
+ }
+
+ /**
+ * Convert a given <code>Date</code> object to a <code>RFC 1123</code>
+ * formatted <code>String</code>.
+ *
+ * @param date the <code>Date</code> object to convert
+ * @return a <code>String</code> representation of the date.
+ */
+ public static String getDateAsString(Date date) {
+ return RFC_1123_FORMAT.format(date);
+ }
+
+}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/HttpUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/HttpUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/HttpUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/HttpUtil.java Thu Aug 4 18:35:27 2011
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import java.io.File;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.deftserver.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/KnuthMorrisPrattAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/KnuthMorrisPrattAlgorithm.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/KnuthMorrisPrattAlgorithm.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/KnuthMorrisPrattAlgorithm.java Thu Aug 4 18:35:27 2011
@@ -17,60 +17,62 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
/**
- * The Knuth Morris Pratt string searching algorithm (or KMP algorithm) searches for occurrences of
- * a "word" W within a main "text string" S by employing the observation that when a mismatch occurs,
- * the word itself embodies sufficient information to determine where the next match could begin,
- * thus bypassing re-examination of previously matched characters.
+ * The Knuth Morris Pratt string searching algorithm (or KMP algorithm) searches
+ * for occurrences of a "word" W within a main "text string" S by employing the
+ * observation that when a mismatch occurs, the word itself embodies sufficient
+ * information to determine where the next match could begin, thus bypassing
+ * re-examination of previously matched characters.
+ *
+ * The algorithm was conceived by Donald Knuth and Vaughan Pratt and
+ * independently by James H. Morris in 1977, but the three published it jointly.
*
- * The algorithm was conceived by Donald Knuth and Vaughan Pratt and independently by James H. Morris
- * in 1977, but the three published it jointly.
- *
*/
public class KnuthMorrisPrattAlgorithm {
- /**
- * Search for pattern in data, [start, end). Returns -1 if no match is found or if pattern is of length 0.
- */
- public static int indexOf(byte[] data, int start, int end, byte[] pattern) {
- if (pattern.length == 0) {
- return -1;
- }
- int[] failure = failure(pattern);
-
- int j = 0;
-
- for (int i = 0; i < end; i++) {
- while (j > 0 && pattern[j] != data[i]) {
- j = failure[j - 1];
- }
- if (pattern[j] == data[i]) {
- j++;
- }
- if (j == pattern.length) {
- return i - pattern.length + 1;
- }
- }
- return -1;
- }
-
- private static int[] failure(byte[] pattern) {
- int[] failure = new int[pattern.length];
-
- int j = 0;
- for (int i = 1; i < pattern.length; i++) {
- while (j>0 && pattern[j] != pattern[i]) {
- j = failure[j - 1];
- }
- if (pattern[j] == pattern[i]) {
- j++;
- }
- failure[i] = j;
- }
+ /**
+ * Search for pattern in data, [start, end). Returns -1 if no match is found
+ * or if pattern is of length 0.
+ */
+ public static int indexOf(byte[] data, int start, int end, byte[] pattern) {
+ if (pattern.length == 0) {
+ return -1;
+ }
+ int[] failure = failure(pattern);
+
+ int j = 0;
+
+ for (int i = 0; i < end; i++) {
+ while (j > 0 && pattern[j] != data[i]) {
+ j = failure[j - 1];
+ }
+ if (pattern[j] == data[i]) {
+ j++;
+ }
+ if (j == pattern.length) {
+ return i - pattern.length + 1;
+ }
+ }
+ return -1;
+ }
+
+ private static int[] failure(byte[] pattern) {
+ int[] failure = new int[pattern.length];
+
+ int j = 0;
+ for (int i = 1; i < pattern.length; i++) {
+ while (j > 0 && pattern[j] != pattern[i]) {
+ j = failure[j - 1];
+ }
+ if (pattern[j] == pattern[i]) {
+ j++;
+ }
+ failure[i] = j;
+ }
- return failure;
- }
+ return failure;
+ }
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/MXBeanUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/MXBeanUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/MXBeanUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/MXBeanUtil.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.lang.management.ManagementFactory;
@@ -28,20 +28,20 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MXBeanUtil {
-
- private static final Logger logger = LoggerFactory.getLogger(MXBeanUtil.class);
-
- private MXBeanUtil() {}
-
- public static void registerMXBean(Object self, String type) {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- try {
- String mbeanName = "org.deftserver:type=" + type + ",name=" + self.getClass().getSimpleName();
- mbs.registerMBean(self, new ObjectName(mbeanName));
- }
- catch (Exception e) {
- logger.error("Unable to register {} MXBean: {}", self.getClass().getCanonicalName(), e);
- }
- }
+
+ private static final Logger logger = LoggerFactory.getLogger(MXBeanUtil.class);
+
+ private MXBeanUtil() {
+ }
+
+ public static void registerMXBean(Object self, String type) {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ try {
+ String mbeanName = "org.apache.deft:type=" + type + ",name=" + self.getClass().getSimpleName();
+ mbs.registerMBean(self, new ObjectName(mbeanName));
+ } catch (Exception e) {
+ logger.error("Unable to register {} MXBean: {}", self.getClass().getCanonicalName(), e);
+ }
+ }
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/NopAsyncResult.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/NopAsyncResult.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/NopAsyncResult.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/NopAsyncResult.java Thu Aug 4 18:35:27 2011
@@ -17,26 +17,31 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
-import org.deftserver.web.AsyncResult;
+import org.apache.deft.web.AsyncResult;
/**
* Convenience class used to limit the Java verboseness.
*/
public class NopAsyncResult<T> {
-
- private NopAsyncResult() {}
-
- public final AsyncResult<T> nopAsyncResult = new AsyncResult<T>() {
-
- @Override public void onFailure(Throwable caught) {}
-
- @Override public void onSuccess(T result) {}
-
- };
-
- public static <T> NopAsyncResult<T> of(Class<T> type) {
- return new NopAsyncResult<T>();
- }
+
+ private NopAsyncResult() {
+ }
+
+ public final AsyncResult<T> nopAsyncResult = new AsyncResult<T>() {
+
+ @Override
+ public void onFailure(Throwable caught) {
+ }
+
+ @Override
+ public void onSuccess(T result) {
+ }
+
+ };
+
+ public static <T> NopAsyncResult<T> of(Class<T> type) {
+ return new NopAsyncResult<T>();
+ }
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/Pair.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/Pair.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/Pair.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/Pair.java Thu Aug 4 18:35:27 2011
@@ -17,19 +17,19 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
public class Pair<T1, T2> {
-
- public final T1 _1;
- public final T2 _2;
-
- public Pair(T1 first, T2 second) {
- this._1 = first;
- this._2 = second;
- }
- public static <X, Y> Pair<X, Y> of(X _1, Y _2) {
- return new Pair<X, Y>(_1, _2);
- }
+ public final T1 _1;
+ public final T2 _2;
+
+ public Pair(T1 first, T2 second) {
+ this._1 = first;
+ this._2 = second;
+ }
+
+ public static <X, Y> Pair<X, Y> of(X _1, Y _2) {
+ return new Pair<X, Y>(_1, _2);
+ }
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/ReflectionTools.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/ReflectionTools.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/ReflectionTools.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/ReflectionTools.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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/util/UrlUtil.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/util/UrlUtil.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/util/UrlUtil.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/util/UrlUtil.java Thu Aug 4 18:35:27 2011
@@ -17,33 +17,35 @@
* under the License.
*
*/
-package org.deftserver.util;
+package org.apache.deft.util;
import java.net.MalformedURLException;
import java.net.URL;
public class UrlUtil {
- /** Example:
- * <pre>
- * {@code
- * url: http://tt.se/ Location: /start => http://tt.se/start
- * url: http://localhost/moved_perm Location: / => http://localhost/
- * url: http://github.com/ Location: http://github.com/ => https://github.com/
- * }
- *
- * (If the new url throws a MalformedURLException the url String representation will be returned.)
- */
- public static String urlJoin(URL url, String locationHeader) {
- try {
- if (locationHeader.startsWith("http")) {
- return new URL(locationHeader).toString();
- }
- return new URL(url.getProtocol() + "://" + url.getAuthority() + locationHeader).toString();
- } catch (MalformedURLException e) {
- return url.toString();
- }
+ /**
+ * Example:
+ *
+ * <pre>
+ * {@code
+ * url: http://tt.se/ Location: /start => http://tt.se/start
+ * url: http://localhost/moved_perm Location: / => http://localhost/
+ * url: http://github.com/ Location: http://github.com/ => https://github.com/
+ * }
+ *
+ * (If the new url throws a MalformedURLException the url String representation will be returned.)
+ */
+ public static String urlJoin(URL url, String locationHeader) {
+ try {
+ if (locationHeader.startsWith("http")) {
+ return new URL(locationHeader).toString();
+ }
+ return new URL(url.getProtocol() + "://" + url.getAuthority() + locationHeader).toString();
+ } catch (MalformedURLException e) {
+ return url.toString();
+ }
- }
+ }
}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/Application.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/Application.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/Application.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/Application.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/Application.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/Application.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/Application.java Thu Aug 4 18:35:27 2011
@@ -17,18 +17,18 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import java.util.Map;
import java.util.regex.Pattern;
-import org.deftserver.util.HttpUtil;
-import org.deftserver.web.handler.BadRequestRequestHandler;
-import org.deftserver.web.handler.ForbiddenRequestHandler;
-import org.deftserver.web.handler.NotFoundRequestHandler;
-import org.deftserver.web.handler.RequestHandler;
-import org.deftserver.web.handler.StaticContentHandler;
-import org.deftserver.web.http.HttpRequest;
+import org.apache.deft.util.HttpUtil;
+import org.apache.deft.web.handler.BadRequestRequestHandler;
+import org.apache.deft.web.handler.ForbiddenRequestHandler;
+import org.apache.deft.web.handler.NotFoundRequestHandler;
+import org.apache.deft.web.handler.RequestHandler;
+import org.apache.deft.web.handler.StaticContentHandler;
+import org.apache.deft.web.http.HttpRequest;
import com.google.common.collect.ImmutableMap;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncCallback.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncCallback.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncCallback.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncCallback.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncCallback.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncCallback.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncCallback.java Thu Aug 4 18:35:27 2011
@@ -17,17 +17,20 @@
* under the License.
*
*/
-package org.deftserver.web;
-
+package org.apache.deft.web;
/**
-* The generic interface a caller must implement to receive an arbitrary callback from an
-* async call (similar to {@link AsyncResult}).
-*/
+ * The generic interface a caller must implement to receive an arbitrary
+ * callback from an async call (similar to {@link AsyncResult}).
+ */
public interface AsyncCallback {
-
- public static final AsyncCallback nopCb = new AsyncCallback() { @Override public void onCallback() { /*nop*/} };
-
- void onCallback();
-
+
+ public static final AsyncCallback nopCb = new AsyncCallback() {
+ @Override
+ public void onCallback() { /* nop */
+ }
+ };
+
+ void onCallback();
+
}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncResult.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncResult.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncResult.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncResult.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncResult.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/AsyncResult.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/AsyncResult.java Thu Aug 4 18:35:27 2011
@@ -17,14 +17,14 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
/**
-* The generic interface a caller must implement to receive a result from an
-* async call
-*/
+ * The generic interface a caller must implement to receive a result from an
+ * async call
+ */
public interface AsyncResult<T> {
-
+
/**
* The asynchronous call failed to complete normally.
*
@@ -38,5 +38,5 @@ public interface AsyncResult<T> {
* @param result return value of the async call
*/
void onSuccess(T result);
-
+
}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/Asynchronous.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/Asynchronous.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/Asynchronous.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/Asynchronous.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/Asynchronous.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/Asynchronous.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/Asynchronous.java Thu Aug 4 18:35:27 2011
@@ -17,21 +17,23 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.web.handler.RequestHandler;
/**
- * Annotation used by implementation of {@link RequestHandler} to denote a method as asynchronous (i.e don't close the
- * Http connection until the client invokes the finish method)
- *
+ * Annotation used by implementation of {@link RequestHandler} to denote a
+ * method as asynchronous (i.e don't close the Http connection until the client
+ * invokes the finish method)
+ *
*/
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
-public @interface Asynchronous {}
+public @interface Asynchronous {
+}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/Authenticated.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/Authenticated.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/Authenticated.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/Authenticated.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/Authenticated.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/Authenticated.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/Authenticated.java Thu Aug 4 18:35:27 2011
@@ -17,22 +17,24 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.web.handler.RequestHandler;
/**
- * Annotation used by implementation of {@link RequestHandler} to show that a method requires that the request
- * (current user) is authenticated (i.e your overridden method {@link RequestHandler#getCurrentUser}
- * returns a non null value)
- *
+ * Annotation used by implementation of {@link RequestHandler} to show that a
+ * method requires that the request (current user) is authenticated (i.e your
+ * overridden method {@link RequestHandler#getCurrentUser} returns a non null
+ * value)
+ *
*/
-@Retention(RetentionPolicy.RUNTIME)
+@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
-public @interface Authenticated {}
+public @interface Authenticated {
+}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpServer.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpServer.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpServer.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpServer.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpServer.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpServer.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpServer.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 java.io.IOException;
import java.net.InetSocketAddress;
@@ -26,12 +26,12 @@ import java.nio.channels.ServerSocketCha
import java.util.List;
import java.util.Map;
-import org.deftserver.configuration.AnnotationsScanner;
-import org.deftserver.configuration.Configuration;
-import org.deftserver.io.IOLoop;
-import org.deftserver.util.Closeables;
-import org.deftserver.web.handler.RequestHandler;
-import org.deftserver.web.http.HttpProtocol;
+import org.apache.deft.configuration.AnnotationsScanner;
+import org.apache.deft.configuration.Configuration;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.util.Closeables;
+import org.apache.deft.web.handler.RequestHandler;
+import org.apache.deft.web.http.HttpProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpVerb.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpVerb.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpVerb.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpVerb.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpVerb.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/HttpVerb.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/HttpVerb.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web;
+package org.apache.deft.web;
/**
* <code>Enumeration</code> of all available HTTP verbs, as defined by <a
@@ -26,12 +26,5 @@ package org.deftserver.web;
*/
public enum HttpVerb {
- GET,
- HEAD,
- POST,
- PUT,
- DELETE,
- OPTIONS,
- TRACE,
- CONNECT;
+ GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT;
}
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/BadRequestRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/BadRequestRequestHandler.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/BadRequestRequestHandler.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/BadRequestRequestHandler.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
public class BadRequestRequestHandler extends RequestHandler {
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/ForbiddenRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/ForbiddenRequestHandler.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/ForbiddenRequestHandler.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/ForbiddenRequestHandler.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
public class ForbiddenRequestHandler extends RequestHandler {
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/NotFoundRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/NotFoundRequestHandler.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/NotFoundRequestHandler.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/NotFoundRequestHandler.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
public class NotFoundRequestHandler extends RequestHandler {
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/RequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/RequestHandler.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/RequestHandler.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/RequestHandler.java Thu Aug 4 18:35:27 2011
@@ -17,16 +17,16 @@
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
import java.lang.annotation.Annotation;
import java.util.Map;
-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.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/StaticContentHandler.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/StaticContentHandler.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/StaticContentHandler.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/handler/StaticContentHandler.java Thu Aug 4 18:35:27 2011
@@ -1,15 +1,10 @@
/*
- * Licensed to the Apache Softwarimport java.io.File;
-
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
-
-import org.deftserver.web.http.HttpException;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-se this file except in compliance
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -22,16 +17,16 @@ se this file except in compliance
* under the License.
*
*/
-package org.deftserver.web.handler;
+package org.apache.deft.web.handler;
import java.io.File;
import javax.activation.FileTypeMap;
-import org.deftserver.util.DateUtil;
-import org.deftserver.web.http.HttpException;
-import org.deftserver.web.http.HttpRequest;
-import org.deftserver.web.http.HttpResponse;
+import org.apache.deft.util.DateUtil;
+import org.apache.deft.web.http.HttpException;
+import org.apache.deft.web.http.HttpRequest;
+import org.apache.deft.web.http.HttpResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/ContentType.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/ContentType.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/ContentType.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/ContentType.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/ContentType.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/ContentType.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/ContentType.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;
/**
* A collection of known content types, for convenience.
@@ -47,5 +47,4 @@ public class ContentType {
/** text/xml */
public static final String TEXT_XML = "text/xml";
-
}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpException.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpException.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpException.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpException.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpException.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpException.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpException.java Thu Aug 4 18:35:27 2011
@@ -17,24 +17,25 @@
* under the License.
*
*/
-package org.deftserver.web.http;
-
+package org.apache.deft.web.http;
public class HttpException extends RuntimeException {
- private final int statusCode;
+ private static final long serialVersionUID = 8066634515515557043L;
+
+ private final int statusCode;
+
+ public HttpException(int statusCode) {
+ this(statusCode, "");
+ }
+
+ public HttpException(int statusCode, String message) {
+ super(message);
+ this.statusCode = statusCode;
+ }
+
+ public int getStatusCode() {
+ return statusCode;
+ }
- public HttpException(int statusCode) {
- this(statusCode, "");
- }
-
- public HttpException(int statusCode, String message) {
- super(message);
- this.statusCode = statusCode;
- }
-
- public int getStatusCode() {
- return statusCode;
- }
-
}
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpProtocol.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpProtocol.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpProtocol.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpProtocol.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpProtocol.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpProtocol.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpProtocol.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
-import static org.deftserver.web.http.HttpServerDescriptor.KEEP_ALIVE_TIMEOUT;
-import static org.deftserver.web.http.HttpServerDescriptor.READ_BUFFER_SIZE;
+import static org.apache.deft.web.http.HttpServerDescriptor.KEEP_ALIVE_TIMEOUT;
+import static org.apache.deft.web.http.HttpServerDescriptor.READ_BUFFER_SIZE;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -32,13 +32,13 @@ import java.nio.channels.ServerSocketCha
import java.nio.channels.SocketChannel;
import java.util.Map;
-import org.deftserver.io.IOHandler;
-import org.deftserver.io.IOLoop;
-import org.deftserver.io.buffer.DynamicByteBuffer;
-import org.deftserver.io.timeout.Timeout;
-import org.deftserver.util.Closeables;
-import org.deftserver.web.Application;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.io.IOHandler;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.io.buffer.DynamicByteBuffer;
+import org.apache.deft.io.timeout.Timeout;
+import org.apache.deft.util.Closeables;
+import org.apache.deft.web.Application;
+import org.apache.deft.web.handler.RequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequest.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequest.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequest.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequest.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequest.java Thu Aug 4 18:35:27 2011
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
import java.net.InetAddress;
import java.util.Collection;
import java.util.Map;
-import org.deftserver.web.HttpVerb;
+import org.apache.deft.web.HttpVerb;
/**
* An HTTP request received from a client
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestDispatcher.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestDispatcher.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestDispatcher.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestDispatcher.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestDispatcher.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestDispatcher.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestDispatcher.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,10 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
-import org.deftserver.web.HttpVerb;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.web.HttpVerb;
+import org.apache.deft.web.handler.RequestHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestImpl.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestImpl.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestImpl.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestImpl.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestImpl.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpRequestImpl.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpRequestImpl.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 java.net.InetAddress;
import java.nio.ByteBuffer;
@@ -27,9 +27,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
-import org.deftserver.io.IOLoop;
-import org.deftserver.util.ArrayUtil;
-import org.deftserver.web.HttpVerb;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.util.ArrayUtil;
+import org.apache.deft.web.HttpVerb;
import com.google.common.base.Charsets;
import com.google.common.base.Strings;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponse.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponse.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponse.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponse.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponse.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponse.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponse.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 java.io.File;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponseImpl.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponseImpl.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponseImpl.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponseImpl.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponseImpl.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpResponseImpl.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpResponseImpl.java Thu Aug 4 18:35:27 2011
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.deftserver.web.http;
+package org.apache.deft.web.http;
-import static org.deftserver.web.http.HttpServerDescriptor.WRITE_BUFFER_SIZE;
+import static org.apache.deft.web.http.HttpServerDescriptor.WRITE_BUFFER_SIZE;
import java.io.File;
import java.io.IOException;
@@ -34,11 +34,11 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import org.deftserver.io.buffer.DynamicByteBuffer;
-import org.deftserver.util.Closeables;
-import org.deftserver.util.CookieUtil;
-import org.deftserver.util.DateUtil;
-import org.deftserver.util.HttpUtil;
+import org.apache.deft.io.buffer.DynamicByteBuffer;
+import org.apache.deft.util.Closeables;
+import org.apache.deft.util.CookieUtil;
+import org.apache.deft.util.DateUtil;
+import org.apache.deft.util.HttpUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpServerDescriptor.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpServerDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpServerDescriptor.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpServerDescriptor.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpServerDescriptor.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/HttpServerDescriptor.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/HttpServerDescriptor.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;
/**
* This class provides a possiblity to change the tunables used by Deft for the http server configuration.
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/MalFormedHttpRequest.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/MalFormedHttpRequest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/MalFormedHttpRequest.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/MalFormedHttpRequest.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/MalFormedHttpRequest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/MalFormedHttpRequest.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/MalFormedHttpRequest.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 com.google.common.collect.Maps;
Copied: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/PartialHttpRequest.java (from r1153694, incubator/deft/sandbox/src/main/java/org/deftserver/web/http/PartialHttpRequest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/PartialHttpRequest.java?p2=incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/PartialHttpRequest.java&p1=incubator/deft/sandbox/src/main/java/org/deftserver/web/http/PartialHttpRequest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/deftserver/web/http/PartialHttpRequest.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/PartialHttpRequest.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 java.util.Map;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/AsynchronousHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/AsynchronousHttpClient.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/AsynchronousHttpClient.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/AsynchronousHttpClient.java Thu Aug 4 18:35:27 2011
@@ -17,20 +17,20 @@
* under the License.
*
*/
-package org.deftserver.web.http.client;
+package org.apache.deft.web.http.client;
import java.io.IOException;
import java.nio.channels.SocketChannel;
import java.util.concurrent.TimeoutException;
-import org.deftserver.io.AsynchronousSocket;
-import org.deftserver.io.IOLoop;
-import org.deftserver.io.timeout.Timeout;
-import org.deftserver.util.NopAsyncResult;
-import org.deftserver.util.UrlUtil;
-import org.deftserver.web.AsyncCallback;
-import org.deftserver.web.AsyncResult;
-import org.deftserver.web.HttpVerb;
+import org.apache.deft.io.AsynchronousSocket;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.io.timeout.Timeout;
+import org.apache.deft.util.NopAsyncResult;
+import org.apache.deft.util.UrlUtil;
+import org.apache.deft.web.AsyncCallback;
+import org.apache.deft.web.AsyncResult;
+import org.apache.deft.web.HttpVerb;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Request.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Request.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Request.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Request.java Thu Aug 4 18:35:27 2011
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.deftserver.web.http.client;
+package org.apache.deft.web.http.client;
import java.net.MalformedURLException;
import java.net.URL;
-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.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Response.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Response.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Response.java (original)
+++ incubator/deft/sandbox/src/main/java/org/apache/deft/web/http/client/Response.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.web.http.client;
+package org.apache.deft.web.http.client;
import java.util.Map;
Modified: incubator/deft/sandbox/src/main/resources/logback.xml
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/main/resources/logback.xml?rev=1153959&r1=1153958&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/main/resources/logback.xml (original)
+++ incubator/deft/sandbox/src/main/resources/logback.xml Thu Aug 4 18:35:27 2011
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!--
+ encoders are assigned the type
+ ch.qos.logback.classic.encoder.PatternLayoutEncoder by default
+ -->
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+ </pattern>
+ </encoder>
+ </appender>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root level="warn">
- <appender-ref ref="STDOUT" />
- </root>
+ <root level="warn">
+ <appender-ref ref="STDOUT" />
+ </root>
</configuration>
-
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/AnnotationsScannerTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/AnnotationsScannerTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/AnnotationsScannerTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/AnnotationsScannerTest.java Thu Aug 4 18:35:27 2011
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.deftserver.configuration;
+package org.apache.deft.configuration;
import static org.junit.Assert.assertEquals;
import java.util.Map;
-import org.deftserver.web.handler.RequestHandler;
+import org.apache.deft.web.handler.RequestHandler;
import org.junit.Test;
/**
@@ -35,7 +35,7 @@ public class AnnotationsScannerTest {
public void testFindHandlers() {
AnnotationsScanner scanner = new AnnotationsScanner();
- Map<String, RequestHandler> handlers = scanner.findHandlers("org.deftserver.example.handler");
+ Map<String, RequestHandler> handlers = scanner.findHandlers("org.apache.deft.example.handler");
assertEquals(3, handlers.size());
}
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/ConfigurationTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/ConfigurationTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/configuration/ConfigurationTest.java Thu Aug 4 18:35:27 2011
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.deftserver.configuration;
+package org.apache.deft.configuration;
-import static org.deftserver.configuration.Configuration.DEFAULT_STATIC_DIRECTORY;
+import static org.apache.deft.configuration.Configuration.DEFAULT_STATIC_DIRECTORY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
Copied: incubator/deft/sandbox/src/test/java/org/apache/deft/io/AsynchronousSocketTest.java (from r1153694, incubator/deft/sandbox/src/test/java/org/deftserver/io/AsynchronousSocketTest.java)
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/AsynchronousSocketTest.java?p2=incubator/deft/sandbox/src/test/java/org/apache/deft/io/AsynchronousSocketTest.java&p1=incubator/deft/sandbox/src/test/java/org/deftserver/io/AsynchronousSocketTest.java&r1=1153694&r2=1153959&rev=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/deftserver/io/AsynchronousSocketTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/AsynchronousSocketTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.io;
+package org.apache.deft.io;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -33,116 +33,145 @@ import java.nio.channels.SocketChannel;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.deftserver.web.AsyncCallback;
-import org.deftserver.web.AsyncResult;
+import org.apache.deft.web.AsyncCallback;
+import org.apache.deft.web.AsyncResult;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class AsynchronousSocketTest {
- public static final String HOST = "localhost";
- public static final int PORT = 6228;
+ public static final String HOST = "localhost";
+ public static final int PORT = 6228;
+
+ @Before
+ public void setup() throws InterruptedException {
+ // start the IOLoop from a new thread so we dont block this test.
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ IOLoop.INSTANCE.start();
+ }
+ }).start();
+ Thread.sleep(300); // hack to avoid SLF4J warning
+
+ final CountDownLatch latch = new CountDownLatch(1);
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ DataInputStream is = null;
+ DataOutputStream os = null;
+ try {
+ System.out.println("waiting for client...");
+ ServerSocket server = new ServerSocket(PORT);
+ latch.countDown();
+ Socket client = server.accept();
+ System.out.println("client connected..");
+ is = new DataInputStream(client.getInputStream());
+ os = new DataOutputStream(client.getOutputStream());
+
+ String recevied = is.readLine();
+ System.out.println("about to send: " + recevied);
+ os.writeBytes(recevied.toUpperCase());
+ System.out.println("sent data to client, shutdown server...");
+ server.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ closeQuietly(is, os);
+ }
+ }
+ }).start();
+
+ latch.await(5, TimeUnit.SECONDS);
+ }
+
+ @After
+ public void tearDown() throws InterruptedException {
+ IOLoop.INSTANCE.addCallback(new AsyncCallback() {
+ @Override
+ public void onCallback() {
+ IOLoop.INSTANCE.stop();
+ }
+ });
+ Thread.sleep(300); // give the IOLoop thread some time to gracefully
+ // shutdown
+ }
+
+ private void closeQuietly(InputStream is, OutputStream os) {
+ try {
+ if (is != null) {
+ is.close();
+ }
+ if (os != null) {
+ os.close();
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private final AsynchronousSocket socket;
+ private final CountDownLatch latch = new CountDownLatch(3); // 3
+ // op/callbacks
+ // (connect,
+ // write, read)
+
+ public AsynchronousSocketTest() throws IOException {
+ socket = new AsynchronousSocket(SocketChannel.open());
+ }
+
+ @Test
+ public void connectWriteAndReadCallbackTest() throws InterruptedException, IOException {
+ AsyncResult<Boolean> ccb = new AsyncResult<Boolean>() {
+ public void onFailure(Throwable caught) {
+ }
+
+ public void onSuccess(Boolean result) {
+ onConnect();
+ }
+ };
+ socket.connect(HOST, PORT, ccb);
+
+ latch.await(5, TimeUnit.SECONDS);
+
+ assertEquals(0, latch.getCount());
+ // TODO stop ioloop
+ }
+
+ private void onConnect() {
+ latch.countDown();
+ AsyncCallback wcb = new AsyncCallback() {
+ @Override
+ public void onCallback() {
+ onWriteComplete();
+ }
+ };
+ socket.write("roger|\r\n".getBytes(), wcb);
+ }
+
+ private void onWriteComplete() {
+ latch.countDown();
+ AsyncResult<byte[]> rcb = new AsyncResult<byte[]>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ assertTrue(false);
+ }
+
+ @Override
+ public void onSuccess(byte[] result) {
+ onReadComplete(new String(result));
+ }
+ };
+ socket.readUntil("|".getBytes(), rcb);
+ }
+
+ private void onReadComplete(String result) {
+ if ("ROGER".equals(result)) {
+ latch.countDown();
+ }
+ assertEquals("ROGER", result);
+ }
- @Before
- public void setup() throws InterruptedException {
- // start the IOLoop from a new thread so we dont block this test.
- new Thread(new Runnable() {
- @Override public void run() { IOLoop.INSTANCE.start(); }
- }).start();
- Thread.sleep(300); // hack to avoid SLF4J warning
-
- final CountDownLatch latch = new CountDownLatch(1);
- new Thread(new Runnable() {
-
- @Override
- public void run() {
- DataInputStream is = null;
- DataOutputStream os = null;
- try {
- System.out.println("waiting for client...");
- ServerSocket server = new ServerSocket(PORT);
- latch.countDown();
- Socket client = server.accept();
- System.out.println("client connected..");
- is = new DataInputStream(client.getInputStream());
- os = new DataOutputStream(client.getOutputStream());
-
- String recevied = is.readLine();
- System.out.println("about to send: " + recevied);
- os.writeBytes(recevied.toUpperCase());
- System.out.println("sent data to client, shutdown server...");
- server.close();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- closeQuietly(is, os);
- }
- }
- }).start();
-
- latch.await(5, TimeUnit.SECONDS);
- }
-
- @After
- public void tearDown() throws InterruptedException {
- IOLoop.INSTANCE.addCallback(new AsyncCallback() {
- @Override
- public void onCallback() { IOLoop.INSTANCE.stop(); }
- });
- Thread.sleep(300); // give the IOLoop thread some time to gracefully shutdown
- }
-
- private void closeQuietly(InputStream is, OutputStream os) {
- try {
- if (is != null) is.close();
- if (os != null) os.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- private final AsynchronousSocket socket;
- private final CountDownLatch latch = new CountDownLatch(3); // 3 op/callbacks (connect, write, read)
-
- public AsynchronousSocketTest() throws IOException {
- socket = new AsynchronousSocket(SocketChannel.open());
- }
-
- @Test
- public void connectWriteAndReadCallbackTest() throws InterruptedException, IOException {
- AsyncResult<Boolean> ccb = new AsyncResult<Boolean>() {
- public void onFailure(Throwable caught) { }
- public void onSuccess(Boolean result) { onConnect(); }
- };
- socket.connect(HOST, PORT, ccb);
-
- latch.await(5, TimeUnit.SECONDS);
-
- assertEquals(0, latch.getCount());
- // TODO stop ioloop
- }
-
- private void onConnect() {
- latch.countDown();
- AsyncCallback wcb = new AsyncCallback() { @Override public void onCallback() { onWriteComplete(); }};
- socket.write("roger|\r\n".getBytes(), wcb);
- }
-
- private void onWriteComplete() {
- latch.countDown();
- AsyncResult<byte[]> rcb = new AsyncResult<byte[]>() {
- @Override public void onFailure(Throwable caught) { assertTrue(false); }
- @Override public void onSuccess(byte[] result) { onReadComplete(new String(result)); }
- };
- socket.readUntil("|".getBytes(), rcb);
- }
-
- private void onReadComplete(String result) {
- if ("ROGER".equals(result)) {
- latch.countDown();
- }
- assertEquals("ROGER", result);
- }
-
}
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/io/buffer/DynamicByteBufferTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/buffer/DynamicByteBufferTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/io/buffer/DynamicByteBufferTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/buffer/DynamicByteBufferTest.java Thu Aug 4 18:35:27 2011
@@ -17,10 +17,11 @@
* under the License.
*
*/
-package org.deftserver.io.buffer;
+package org.apache.deft.io.buffer;
import static org.junit.Assert.assertEquals;
+import org.apache.deft.io.buffer.DynamicByteBuffer;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/JMXDebuggableCallbackManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/JMXDebuggableCallbackManagerTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/JMXDebuggableCallbackManagerTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/JMXDebuggableCallbackManagerTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.io.callback;
+package org.apache.deft.io.callback;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -27,7 +27,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.callback.JMXDebuggableCallbackManager;
+import org.apache.deft.web.AsyncCallback;
import org.junit.Test;
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/PeriodicCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/PeriodicCallbackTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/PeriodicCallbackTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/callback/PeriodicCallbackTest.java Thu Aug 4 18:35:27 2011
@@ -17,15 +17,16 @@
* under the License.
*
*/
-package org.deftserver.io.callback;
+package org.apache.deft.io.callback;
import static org.junit.Assert.assertEquals;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.deftserver.io.IOLoop;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.IOLoop;
+import org.apache.deft.io.callback.PeriodicCallback;
+import org.apache.deft.web.AsyncCallback;
import org.junit.Test;
public class PeriodicCallbackTest {
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/JMXDebuggableTimeoutManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/JMXDebuggableTimeoutManagerTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/JMXDebuggableTimeoutManagerTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/JMXDebuggableTimeoutManagerTest.java Thu Aug 4 18:35:27 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.deftserver.io.timeout;
+package org.apache.deft.io.timeout;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -30,7 +30,9 @@ import java.nio.channels.Selector;
import java.nio.channels.spi.SelectorProvider;
import java.util.Map;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.timeout.JMXDebuggableTimeoutManager;
+import org.apache.deft.io.timeout.Timeout;
+import org.apache.deft.web.AsyncCallback;
import org.junit.Test;
import com.google.common.collect.Maps;
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/TimeoutTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/TimeoutTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/TimeoutTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/io/timeout/TimeoutTest.java Thu Aug 4 18:35:27 2011
@@ -17,12 +17,13 @@
* under the License.
*
*/
-package org.deftserver.io.timeout;
+package org.apache.deft.io.timeout;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.deftserver.web.AsyncCallback;
+import org.apache.deft.io.timeout.Timeout;
+import org.apache.deft.web.AsyncCallback;
import org.junit.Test;
public class TimeoutTest {
Modified: incubator/deft/sandbox/src/test/java/org/apache/deft/util/DateUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/deft/sandbox/src/test/java/org/apache/deft/util/DateUtilTest.java?rev=1153959&r1=1153694&r2=1153959&view=diff
==============================================================================
--- incubator/deft/sandbox/src/test/java/org/apache/deft/util/DateUtilTest.java (original)
+++ incubator/deft/sandbox/src/test/java/org/apache/deft/util/DateUtilTest.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;
@@ -30,39 +30,39 @@ import org.junit.Test;
*/
public class DateUtilTest {
- @Test
- public void testParseToMillisecondsForLong() {
+ @Test
+ public void testParseToMillisecondsForLong() {
+
+ final long actual = DateUtil.parseToMilliseconds("123");
+ assertEquals(123, actual);
+ }
+
+ @Test
+ public void testParseToMillisecondsForRFC1123String() {
+
+ final long actual = DateUtil.parseToMilliseconds("Sat, 20 Feb 2010 18:12:38 GMT");
+ assertEquals(1266689558000L, actual);
+ }
+
+ @Test
+ public void testParseToMillisecondsForInvalidString() {
+
+ final long actual = DateUtil.parseToMilliseconds("INVALID");
+ assertEquals(0, actual);
+ }
+
+ @Test
+ public void testParseToRFC1123() {
+
+ final String actual = DateUtil.parseToRFC1123(1266689558000L);
+ assertEquals("Sat, 20 Feb 2010 18:12:38 GMT", actual);
+ }
- final long actual = DateUtil.parseToMilliseconds("123");
- assertEquals(123, actual);
- }
-
- @Test
- public void testParseToMillisecondsForRFC1123String() {
-
- final long actual = DateUtil.parseToMilliseconds("Sat, 20 Feb 2010 18:12:38 GMT");
- assertEquals(1266689558000L, actual);
- }
-
- @Test
- public void testParseToMillisecondsForInvalidString() {
-
- final long actual = DateUtil.parseToMilliseconds("INVALID");
- assertEquals(0, actual);
- }
-
- @Test
- public void testParseToRFC1123() {
-
- final String actual = DateUtil.parseToRFC1123(1266689558000L);
- assertEquals("Sat, 20 Feb 2010 18:12:38 GMT", actual);
- }
-
@Test
public void testGetDateAsString() {
-
+
Date date = new Date(1266689558000L);
String actual = DateUtil.getDateAsString(date);
assertEquals("Sat, 20 Feb 2010 18:12:38 GMT", actual);
- }
-}
\ No newline at end of file
+ }
+}