Author: david.lloyd(a)jboss.com
Date: 2009-02-26 16:56:19 -0500 (Thu, 26 Feb 2009)
New Revision: 4862
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java
Log:
Import cleanup
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java 2009-02-26 21:55:31
UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java 2009-02-26 21:56:19
UTC (rev 4862)
@@ -1,9 +1,9 @@
package org.jboss.remoting3;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CancellationException;
import java.io.IOException;
import java.io.ObjectStreamException;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentMap;
import org.jboss.xnio.IoFuture;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -23,8 +23,6 @@
package org.jboss.remoting3;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.ClientContext;
-import org.jboss.remoting3.ServiceContext;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -24,10 +24,6 @@
import java.io.IOException;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.Client;
-import org.jboss.remoting3.CloseHandler;
-import org.jboss.remoting3.IndeterminateOutcomeException;
-import org.jboss.remoting3.RemoteRequestException;
import org.jboss.remoting3.spi.Handle;
import org.jboss.remoting3.spi.RemoteRequestContext;
import org.jboss.remoting3.spi.ReplyHandler;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -23,10 +23,6 @@
package org.jboss.remoting3;
import java.io.IOException;
-import org.jboss.remoting3.Client;
-import org.jboss.remoting3.ClientSource;
-import org.jboss.remoting3.CloseHandler;
-import org.jboss.remoting3.Endpoint;
import org.jboss.remoting3.spi.AbstractHandleableCloseable;
import org.jboss.remoting3.spi.Handle;
import org.jboss.remoting3.spi.RequestHandler;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -1,11 +1,11 @@
package org.jboss.remoting3;
+import java.io.IOException;
+import java.net.URI;
import java.util.concurrent.ConcurrentMap;
-import java.net.URI;
-import java.io.IOException;
+import org.jboss.remoting3.spi.Handle;
import org.jboss.remoting3.spi.RequestHandler;
import org.jboss.remoting3.spi.RequestHandlerSource;
-import org.jboss.remoting3.spi.Handle;
import org.jboss.xnio.IoFuture;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -13,18 +13,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.Client;
-import org.jboss.remoting3.ClientSource;
-import org.jboss.remoting3.CloseHandler;
-import org.jboss.remoting3.Endpoint;
-import org.jboss.remoting3.EndpointPermission;
-import org.jboss.remoting3.LocalServiceConfiguration;
-import org.jboss.remoting3.RemoteServiceConfiguration;
-import org.jboss.remoting3.RequestListener;
-import org.jboss.remoting3.ServiceListener;
-import org.jboss.remoting3.ServiceURI;
-import org.jboss.remoting3.SimpleCloseable;
-import org.jboss.remoting3.Version;
import org.jboss.remoting3.spi.AbstractHandleableCloseable;
import org.jboss.remoting3.spi.AbstractSimpleCloseable;
import org.jboss.remoting3.spi.Handle;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -23,8 +23,6 @@
package org.jboss.remoting3;
import java.io.IOException;
-import org.jboss.remoting3.ClientSource;
-import org.jboss.remoting3.SimpleCloseable;
import org.jboss.xnio.AbstractIoFuture;
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.IoUtils;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.ReplyException;
import org.jboss.remoting3.spi.RemoteRequestContext;
import org.jboss.remoting3.spi.ReplyHandler;
import org.jboss.xnio.AbstractIoFuture;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -1,7 +1,7 @@
package org.jboss.remoting3;
+import java.io.Closeable;
import java.io.IOException;
-import java.io.Closeable;
/**
* A Remoting resource that can be closed.
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -25,9 +25,6 @@
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
-import org.jboss.remoting3.RemoteExecutionException;
-import org.jboss.remoting3.RemoteRequestException;
-import org.jboss.remoting3.RequestListener;
import org.jboss.remoting3.spi.AbstractAutoCloseable;
import org.jboss.remoting3.spi.RemoteRequestContext;
import org.jboss.remoting3.spi.ReplyHandler;
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -24,8 +24,6 @@
import java.io.IOException;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.CloseHandler;
-import org.jboss.remoting3.RequestListener;
import org.jboss.remoting3.spi.AbstractAutoCloseable;
import org.jboss.remoting3.spi.Handle;
import org.jboss.remoting3.spi.RequestHandler;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -22,14 +22,14 @@
package org.jboss.remoting3;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.NoSuchElementException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.io.UnsupportedEncodingException;
/**
* A qualified name for service registration. A qualified name is a path-like structure
comprised of a series of
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -1,17 +1,17 @@
package org.jboss.remoting3;
import java.io.IOException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.Executors;
+import org.jboss.remoting3.spi.Handle;
import org.jboss.remoting3.spi.RequestHandler;
import org.jboss.remoting3.spi.RequestHandlerSource;
-import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.CloseableExecutor;
import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.CloseableExecutor;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java 2009-02-26
21:55:31 UTC (rev 4861)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -1,8 +1,8 @@
package org.jboss.remoting3;
+import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
-import java.io.IOException;
/**
* The context of a single request. A request listener is obligated to call exactly one
of the three {@code send} methods
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -28,12 +28,6 @@
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.jboss.remoting3.ClientContext;
-import org.jboss.remoting3.IndeterminateOutcomeException;
-import org.jboss.remoting3.RemoteExecutionException;
-import org.jboss.remoting3.RemoteReplyException;
-import org.jboss.remoting3.RequestCancelHandler;
-import org.jboss.remoting3.RequestContext;
import org.jboss.remoting3.spi.ReplyHandler;
import org.jboss.remoting3.spi.SpiUtils;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -23,7 +23,6 @@
package org.jboss.remoting3;
import java.util.concurrent.Executor;
-import org.jboss.remoting3.ServiceContext;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -22,7 +22,6 @@
package org.jboss.remoting3;
-import org.jboss.remoting3.SimpleCloseable;
import org.jboss.remoting3.spi.RequestHandlerSource;
/**
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -22,16 +22,16 @@
package org.jboss.remoting3.spi;
+import java.io.Closeable;
import java.io.IOException;
-import java.io.Closeable;
+import java.lang.ref.WeakReference;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
-import java.lang.ref.WeakReference;
+import org.jboss.remoting3.CloseHandler;
import org.jboss.remoting3.RemotingException;
-import org.jboss.remoting3.CloseHandler;
-import org.jboss.xnio.log.Logger;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.WeakCloseable;
+import org.jboss.xnio.log.Logger;
/**
* A closeable implementation that supports reference counting. Since the initial
reference count is zero, implementors
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -22,8 +22,8 @@
package org.jboss.remoting3.spi;
+import java.io.IOException;
import org.jboss.remoting3.HandleableCloseable;
-import java.io.IOException;
/**
* A closeable resource which closes automatically when the number of active handles
reaches zero. Handles are considered
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -22,15 +22,15 @@
package org.jboss.remoting3.spi;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
+import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import java.util.Collections;
-import java.io.IOException;
-import org.jboss.remoting3.ServiceRegistrationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.jboss.remoting3.CloseHandler;
import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.ServiceRegistrationException;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java
===================================================================
---
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java 2009-02-26
21:55:31 UTC (rev 4861)
+++
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java 2009-02-26
21:56:19 UTC (rev 4862)
@@ -1,8 +1,8 @@
package org.jboss.remoting3.stream;
import java.io.Closeable;
+import java.io.Flushable;
import java.io.IOException;
-import java.io.Flushable;
/**
* A streaming sink for objects.