jboss-remoting-commits
February 2009
jboss-remoting-commits@lists.jboss.org
- 1 participants
- 14 discussions
JBoss Remoting SVN: r4863 - remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 18:06:03 -0500 (Thu, 26 Feb 2009)
New Revision: 4863
Added:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectPipe.java
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java
Log:
Clarify ObjectSource semantics. Implement an object pipe for connecting a remote ObjectSink to a local ObjectSource.
Added: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectPipe.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectPipe.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectPipe.java 2009-02-26 23:06:03 UTC (rev 4863)
@@ -0,0 +1,211 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.stream;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.EOFException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.Condition;
+import java.util.Queue;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+
+/**
+ * A pipe for objects. Typically, data is written to the sink side of the pipe from one thread while being read from
+ * the source side in another thread. Object pipes are useful in the case that you send an {@link
+ * org.jboss.remoting3.stream.ObjectSink ObjectSink} to a remote system in a request, but you want to read the objects
+ * from an {@link org.jboss.remoting3.stream.ObjectSource ObjectSource}.
+ */
+public final class ObjectPipe<T> {
+
+ private final Lock queueLock = new ReentrantLock();
+ // signal on write, await on read
+ private final Condition writeCondition = queueLock.newCondition();
+ // signal on read, await on write
+ private final Condition readCondition = queueLock.newCondition();
+
+ private final Queue<T> queue = new LinkedList<T>();
+
+ private final Source source = new Source();
+ private final Sink sink = new Sink();
+ private final int max;
+ private boolean open = true;
+
+ /**
+ * Create an object pipe with the given maximum buffer size.
+ *
+ * @param max the maximum number of buffered objects
+ */
+ public ObjectPipe(int max) {
+ this.max = max;
+ }
+
+ /**
+ * Get the source end of the pipe, from which objects may be read.
+ *
+ * @return the source end
+ */
+ public ObjectSource<T> getSource() {
+ return source;
+ }
+
+ /**
+ * Get the sink end of the pipe, to which objects may be written.
+ *
+ * @return the sink end
+ */
+ public ObjectSink<T> getSink() {
+ return sink;
+ }
+
+ private class Source implements ObjectSource<T> {
+
+ public boolean hasNext() throws IOException {
+ final Lock queueLock = ObjectPipe.this.queueLock;
+ final Condition writeCondition = ObjectPipe.this.writeCondition;
+ final Queue<T> queue = ObjectPipe.this.queue;
+ try {
+ queueLock.lockInterruptibly();
+ try {
+ while (open && queue.isEmpty()) {
+ writeCondition.await();
+ }
+ return open || !queue.isEmpty();
+ } finally {
+ queueLock.unlock();
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new InterruptedIOException("hasNext() was interrupted");
+ }
+ }
+
+ public T next() throws IOException {
+ final Lock queueLock = ObjectPipe.this.queueLock;
+ final Queue<T> queue = ObjectPipe.this.queue;
+ try {
+ queueLock.lockInterruptibly();
+ try {
+ final T t = queue.poll();
+ if (t == null) {
+ if (open) {
+ throw new NoSuchElementException();
+ } else {
+ throw new EOFException("EOF on next()");
+ }
+ }
+ readCondition.signal();
+ return t;
+ } finally {
+ queueLock.unlock();
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new InterruptedIOException("hasNext() was interrupted");
+ }
+ }
+
+ /**
+ * Closing the reader breaks everything. All unread items are discarded, all waiters are woken up.
+ */
+ public void close() {
+ final Lock queueLock = ObjectPipe.this.queueLock;
+ queueLock.lock();
+ try {
+ if (open) {
+ open = false;
+ queue.clear();
+ writeCondition.signalAll();
+ readCondition.signalAll();
+ }
+ } finally {
+ queueLock.unlock();
+ }
+ }
+
+ protected void finalize() throws Throwable {
+ close();
+ super.finalize();
+ }
+ }
+
+ private class Sink implements ObjectSink<T> {
+
+ public void accept(final T instance) throws IOException {
+ final int max = ObjectPipe.this.max;
+ final Queue<T> queue = ObjectPipe.this.queue;
+ final Lock queueLock = ObjectPipe.this.queueLock;
+ try {
+ queueLock.lockInterruptibly();
+ try {
+ while (open && queue.size() == max) {
+ readCondition.await();
+ }
+ if (!open) {
+ throw new EOFException("pipe closed");
+ }
+ } finally {
+ queueLock.unlock();
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new InterruptedIOException("accept(T) was interrupted");
+ }
+ }
+
+ /**
+ * Do nothing since nothing can be done - clearing our internal state depends on the reader.
+ */
+ public void flush() {
+ }
+
+ /**
+ * Closing the writer just clears the open flag and notifies waiters.
+ */
+ public void close() {
+ final Lock queueLock = ObjectPipe.this.queueLock;
+ queueLock.lock();
+ try {
+ if (!open) return;
+ open = false;
+ // readers might be waiting
+ if (queue.isEmpty()) {
+ readCondition.signalAll();
+ } else {
+ readCondition.signal();
+ }
+ // other writers might also be waiting - they should be killed
+ writeCondition.signalAll();
+ } finally {
+ queueLock.unlock();
+ }
+ }
+
+ protected void finalize() throws Throwable {
+ close();
+ super.finalize();
+ }
+ }
+}
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java 2009-02-26 21:56:19 UTC (rev 4862)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java 2009-02-26 23:06:03 UTC (rev 4863)
@@ -2,6 +2,7 @@
import java.io.Closeable;
import java.io.IOException;
+import java.util.NoSuchElementException;
/**
* A streaming source for objects.
@@ -12,29 +13,31 @@
/**
* Indicate whether there are more objects to retrieve. If this method returns {@code true}, an object is
- * guaranteed to be available. If this method returns {@code false}, there is no object available; however, an
- * object may become available at a later time, depending on the implementation.
+ * guaranteed to be available. If this method returns {@code false}, the end of stream has been reached.
* <p/>
* If this method returns {@code true}, it will continue to return {@code true} on every subsequent invocation until
- * the next object is pulled using the {@code next()} method, or until the object source is closed.
+ * the next object is pulled using the {@code next()} method, or until the object source is closed. This method
+ * may block until the presence of the next object in the stream has been ascertained.
*
* @return {@code true} if there are more objects in this stream
*/
boolean hasNext() throws IOException;
/**
- * Get the next object in the stream.
+ * Get the next object in the stream. The {@code hasNext()} method should be called before this method is called
+ * to avoid receiving a {@code NoSuchElementException}.
*
* @return the next object
*
- * @throws IOException if the stream can no longer be read
+ * @throws NoSuchElementException if no object is available
+ * @throws IOException if an I/O error occurs
*/
- T next() throws IOException;
+ T next() throws NoSuchElementException, IOException;
/**
* Close the stream. No more objects may be read from this stream after it has been closed.
*
- * @throws IOException if an error occurs
+ * @throws IOException if an I/O error occurs
*/
void close() throws IOException;
}
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4862 - in remoting3/trunk/api/src/main/java/org/jboss/remoting3: spi and 1 other directories.
by jboss-remoting-commits＠lists.jboss.org
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.
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4861 - in remoting3-multiplex/trunk/main/src: test/java/org/jboss/remoting3 and 1 other directory.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 16:55:31 -0500 (Thu, 26 Feb 2009)
New Revision: 4861
Removed:
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/protocol/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/
Log:
cleanup
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4860 - in remoting3-multiplex/trunk/main/src/test/java/org/jboss: remoting3 and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 16:54:16 -0500 (Thu, 26 Feb 2009)
New Revision: 4860
Added:
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/
Removed:
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/multiplex/
Log:
Incremental - still more work to go before this will compile (2)
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3 (from rev 4848, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting)
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex (from rev 4848, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex)
Deleted: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
===================================================================
--- remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex/ConnectionTestCase.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java 2009-02-26 21:54:16 UTC (rev 4860)
@@ -1,181 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.CountDownLatch;
-import java.io.IOException;
-import junit.framework.TestCase;
-import org.jboss.remoting.core.EndpointImpl;
-import org.jboss.remoting.test.support.LoggingHelper;
-import org.jboss.remoting.LocalServiceConfiguration;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.ClientContext;
-import org.jboss.remoting.ServiceContext;
-import org.jboss.remoting.RequestContext;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.QualifiedName;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.BufferAllocator;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.Xnio;
-import org.jboss.xnio.CloseableExecutor;
-import org.jboss.xnio.ChannelSource;
-import org.jboss.xnio.IoHandlerFactory;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.Buffers;
-import org.jboss.xnio.log.Logger;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.xnio.channels.Channels;
-import org.jboss.xnio.nio.NioXnio;
-import org.jboss.river.RiverMarshallerFactory;
-import org.jboss.marshalling.MarshallingConfiguration;
-
-/**
- *
- */
-public final class ConnectionTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
-
- public static final Logger log = Logger.getLogger(ConnectionTestCase.class.getSimpleName());
-
- public void testConnection() throws Throwable {
- final String REQUEST = "request";
- final String REPLY = "reply";
- final List<Throwable> problems = Collections.synchronizedList(new LinkedList<Throwable>());
- final CloseableExecutor closeableExecutor = IoUtils.closeableExecutor(Executors.newCachedThreadPool(), 500L, TimeUnit.MILLISECONDS);
- try {
- final BufferAllocator<ByteBuffer> allocator = Buffers.createHeapByteBufferAllocator(1024);
- final Xnio xnio = NioXnio.create();
- try {
- final EndpointImpl remoteEndpoint = new EndpointImpl(closeableExecutor, "left-side");
- try {
- final EndpointImpl endpoint = new EndpointImpl(closeableExecutor, "right-side");
- try {
- final CountDownLatch latch = new CountDownLatch(1);
- final MultiplexConfiguration configuration = new MultiplexConfiguration();
- configuration.setAllocator(allocator);
- configuration.setExecutor(closeableExecutor);
- configuration.setLinkMetric(10);
- configuration.setMarshallerFactory(new RiverMarshallerFactory());
- final NamedServiceRegistry registry = new NamedServiceRegistry();
- configuration.setNamedServiceRegistry(registry);
- final MarshallingConfiguration marshallingConfiguration = new MarshallingConfiguration();
- configuration.setMarshallingConfiguration(marshallingConfiguration);
- final LocalServiceConfiguration<Object, Object> localServiceConfiguration = new LocalServiceConfiguration<Object, Object>(new RequestListener<Object, Object>() {
- public void handleClientOpen(final ClientContext context) {
- log.debug("Client open");
- }
-
- public void handleServiceOpen(final ServiceContext context) {
- }
-
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- try {
- context.sendReply(REPLY);
- } catch (IOException e) {
- log.error(e, "Failed to send reply");
- problems.add(e);
- }
- }
-
- public void handleServiceClose(final ServiceContext context) {
- }
-
- public void handleClientClose(final ClientContext context) {
- log.debug("Client closed");
- latch.countDown();
- }
-
- public String toString() {
- return "TestListener";
- }
- }, Object.class, Object.class);
- localServiceConfiguration.setServiceType("connection.test");
- localServiceConfiguration.setGroupName("testgroup");
- localServiceConfiguration.setMetric(10);
- final Handle<RequestHandlerSource> requestHandlerSourceHandle = remoteEndpoint.registerService(localServiceConfiguration);
- try {
- registry.registerService(QualifiedName.parse("/test/connectiontest"), requestHandlerSourceHandle.getResource());
- final IoHandlerFactory<AllocatedMessageChannel> handlerFactory = MultiplexProtocol.createServer(remoteEndpoint, configuration);
- final ChannelSource<AllocatedMessageChannel> channelSource = Channels.convertStreamToAllocatedMessage(xnio.createPipeServer(Channels.convertStreamToAllocatedMessage(handlerFactory, 16384, 16384)), 16384, 16384);
- final IoFuture<MultiplexConnection> future = MultiplexProtocol.connect(endpoint, configuration, channelSource);
- final MultiplexConnection connection = future.get();
- try {
- final Handle<RequestHandlerSource> remoteHandlerSource = connection.openRemoteService(QualifiedName.parse("/test/connectiontest"));
- try {
- final ClientSource<Object, Object> clientSource = endpoint.createClientSource(remoteHandlerSource.getResource(), Object.class, Object.class);
- try {
- final Client<Object,Object> client = clientSource.createClient();
- try {
- final IoFuture<Object> futureReply = client.send(REQUEST);
- assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
- assertEquals(REPLY, futureReply.get());
- client.close();
- clientSource.close();
- remoteHandlerSource.close();
- connection.close();
- assertTrue(latch.await(1L, TimeUnit.SECONDS));
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(clientSource);
- }
- } finally {
- IoUtils.safeClose(remoteHandlerSource);
- }
- } finally {
- IoUtils.safeClose(connection);
- }
- } finally {
- IoUtils.safeClose(requestHandlerSourceHandle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- IoUtils.safeClose(remoteEndpoint);
- }
- } finally {
- IoUtils.safeClose(xnio);
- }
- } finally {
- IoUtils.safeClose(closeableExecutor);
- }
- for (Throwable t : problems) {
- throw t;
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java (from rev 4858, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex/ConnectionTestCase.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java 2009-02-26 21:54:16 UTC (rev 4860)
@@ -0,0 +1,178 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountDownLatch;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.jboss.remoting3.LocalServiceConfiguration;
+import org.jboss.remoting3.RequestListener;
+import org.jboss.remoting3.ClientContext;
+import org.jboss.remoting3.ServiceContext;
+import org.jboss.remoting3.RequestContext;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.ClientSource;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.BufferAllocator;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.Xnio;
+import org.jboss.xnio.CloseableExecutor;
+import org.jboss.xnio.ChannelSource;
+import org.jboss.xnio.IoHandlerFactory;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.Buffers;
+import org.jboss.xnio.log.Logger;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+import org.jboss.xnio.channels.Channels;
+import org.jboss.xnio.nio.NioXnio;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.river.RiverMarshallerFactory;
+
+/**
+ *
+ */
+public final class ConnectionTestCase extends TestCase {
+
+ public static final Logger log = Logger.getLogger(ConnectionTestCase.class.getSimpleName());
+
+ public void testConnection() throws Throwable {
+ final String REQUEST = "request";
+ final String REPLY = "reply";
+ final List<Throwable> problems = Collections.synchronizedList(new LinkedList<Throwable>());
+ final CloseableExecutor closeableExecutor = IoUtils.closeableExecutor(Executors.newCachedThreadPool(), 500L, TimeUnit.MILLISECONDS);
+ try {
+ final BufferAllocator<ByteBuffer> allocator = Buffers.createHeapByteBufferAllocator(1024);
+ final Xnio xnio = NioXnio.create();
+ try {
+ final Endpoint remoteEndpoint = Remoting.createEndpoint(closeableExecutor, "left-side");
+ try {
+ final Endpoint endpoint = Remoting.createEndpoint(closeableExecutor, "right-side");
+ try {
+ final CountDownLatch latch = new CountDownLatch(1);
+ final MultiplexConfiguration configuration = new MultiplexConfiguration();
+ configuration.setAllocator(allocator);
+ configuration.setExecutor(closeableExecutor);
+ configuration.setLinkMetric(10);
+ configuration.setMarshallerFactory(new RiverMarshallerFactory());
+ final NamedServiceRegistry registry = new NamedServiceRegistry();
+ configuration.setNamedServiceRegistry(registry);
+ final MarshallingConfiguration marshallingConfiguration = new MarshallingConfiguration();
+ configuration.setMarshallingConfiguration(marshallingConfiguration);
+ final LocalServiceConfiguration<Object, Object> localServiceConfiguration = new LocalServiceConfiguration<Object, Object>(new RequestListener<Object, Object>() {
+ public void handleClientOpen(final ClientContext context) {
+ log.debug("Client open");
+ }
+
+ public void handleServiceOpen(final ServiceContext context) {
+ }
+
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ try {
+ context.sendReply(REPLY);
+ } catch (IOException e) {
+ log.error(e, "Failed to send reply");
+ problems.add(e);
+ }
+ }
+
+ public void handleServiceClose(final ServiceContext context) {
+ }
+
+ public void handleClientClose(final ClientContext context) {
+ log.debug("Client closed");
+ latch.countDown();
+ }
+
+ public String toString() {
+ return "TestListener";
+ }
+ }, Object.class, Object.class);
+ localServiceConfiguration.setServiceType("connection.test");
+ localServiceConfiguration.setGroupName("testgroup");
+ localServiceConfiguration.setMetric(10);
+ final Handle<RequestHandlerSource> requestHandlerSourceHandle = remoteEndpoint.registerService(localServiceConfiguration);
+ try {
+ registry.registerService(QualifiedName.parse("/test/connectiontest"), requestHandlerSourceHandle.getResource());
+ final IoHandlerFactory<AllocatedMessageChannel> handlerFactory = MultiplexProtocol.createServer(configuration);
+ final ChannelSource<AllocatedMessageChannel> channelSource = Channels.convertStreamToAllocatedMessage(xnio.createPipeServer(Channels.convertStreamToAllocatedMessage(handlerFactory, 16384, 16384)), 16384, 16384);
+ final IoFuture<MultiplexConnection> future = MultiplexProtocol.connect(configuration, channelSource);
+ final MultiplexConnection connection = future.get();
+ try {
+ final Handle<RequestHandlerSource> remoteHandlerSource = connection.openRemoteService(QualifiedName.parse("/test/connectiontest"));
+ try {
+ final ClientSource<Object, Object> clientSource = endpoint.createClientSource(remoteHandlerSource.getResource(), Object.class, Object.class);
+ try {
+ final Client<Object,Object> client = clientSource.createClient();
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(REQUEST);
+ assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
+ assertEquals(REPLY, futureReply.get());
+ client.close();
+ clientSource.close();
+ remoteHandlerSource.close();
+ connection.close();
+ assertTrue(latch.await(1L, TimeUnit.SECONDS));
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(clientSource);
+ }
+ } finally {
+ IoUtils.safeClose(remoteHandlerSource);
+ }
+ } finally {
+ IoUtils.safeClose(connection);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandlerSourceHandle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ IoUtils.safeClose(remoteEndpoint);
+ }
+ } finally {
+ IoUtils.safeClose(xnio);
+ }
+ } finally {
+ IoUtils.safeClose(closeableExecutor);
+ }
+ for (Throwable t : problems) {
+ throw t;
+ }
+ }
+}
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol (from rev 4858, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol)
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4859 - in remoting3-multiplex/trunk/main/src: main/java/org/jboss/remoting3 and 8 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 16:52:06 -0500 (Thu, 26 Feb 2009)
New Revision: 4859
Added:
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Connection.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionClient.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionListener.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServer.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceListener.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceProvider.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Multiplex.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ServiceConfiguration.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SynchronizedSet.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/impl/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/impl/AbstractConnectionServiceProvider.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/SAClassTable.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisement.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementReply.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementRequestListener.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/protocol/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/
Removed:
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/protocol/
remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/protocol/multiplex/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/
remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol/multiplex/
Log:
Incremental - still more work to go before this will compile
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3 (from rev 4848, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting)
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex (from rev 4848, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex)
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/BufferByteOutput.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,90 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.marshalling.ByteOutput;
-import org.jboss.xnio.BufferAllocator;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-/**
- *
- */
-public class BufferByteOutput implements ByteOutput {
-
- private ByteBuffer current;
- private final BufferAllocator<ByteBuffer> allocator;
- private final Collection<ByteBuffer> target;
-
- public BufferByteOutput(final BufferAllocator<ByteBuffer> allocator, final Collection<ByteBuffer> target) {
- this.allocator = allocator;
- this.target = target;
- }
-
- private ByteBuffer getCurrent() {
- final ByteBuffer buffer = current;
- return buffer == null ? (current = allocator.allocate()) : buffer;
- }
-
- public void write(final int i) {
- final ByteBuffer buffer = getCurrent();
- buffer.put((byte) i);
- if (! buffer.hasRemaining()) {
- buffer.flip();
- target.add(buffer);
- current = null;
- }
- }
-
- public void write(final byte[] bytes) {
- write(bytes, 0, bytes.length);
- }
-
- public void write(final byte[] bytes, int offs, int len) {
- while (len > 0) {
- final ByteBuffer buffer = getCurrent();
- final int c = Math.min(len, buffer.remaining());
- buffer.put(bytes, offs, c);
- offs += c;
- len -= c;
- if (! buffer.hasRemaining()) {
- buffer.flip();
- target.add(buffer);
- current = null;
- }
- }
- }
-
- public void close() {
- flush();
- }
-
- public void flush() {
- final ByteBuffer buffer = current;
- if (buffer != null) {
- buffer.flip();
- target.add(buffer);
- current = null;
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/BufferByteOutput.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/BufferByteOutput.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.marshalling.ByteOutput;
+import org.jboss.xnio.BufferAllocator;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+
+/**
+ *
+ */
+public class BufferByteOutput implements ByteOutput {
+
+ private ByteBuffer current;
+ private final BufferAllocator<ByteBuffer> allocator;
+ private final Collection<ByteBuffer> target;
+
+ public BufferByteOutput(final BufferAllocator<ByteBuffer> allocator, final Collection<ByteBuffer> target) {
+ this.allocator = allocator;
+ this.target = target;
+ }
+
+ private ByteBuffer getCurrent() {
+ final ByteBuffer buffer = current;
+ return buffer == null ? (current = allocator.allocate()) : buffer;
+ }
+
+ public void write(final int i) {
+ final ByteBuffer buffer = getCurrent();
+ buffer.put((byte) i);
+ if (! buffer.hasRemaining()) {
+ buffer.flip();
+ target.add(buffer);
+ current = null;
+ }
+ }
+
+ public void write(final byte[] bytes) {
+ write(bytes, 0, bytes.length);
+ }
+
+ public void write(final byte[] bytes, int offs, int len) {
+ while (len > 0) {
+ final ByteBuffer buffer = getCurrent();
+ final int c = Math.min(len, buffer.remaining());
+ buffer.put(bytes, offs, c);
+ offs += c;
+ len -= c;
+ if (! buffer.hasRemaining()) {
+ buffer.flip();
+ target.add(buffer);
+ current = null;
+ }
+ }
+ }
+
+ public void close() {
+ flush();
+ }
+
+ public void flush() {
+ final ByteBuffer buffer = current;
+ if (buffer != null) {
+ buffer.flip();
+ target.add(buffer);
+ current = null;
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Connection.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Connection.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Connection.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.AutoCloseable;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.xnio.IoFuture;
+
+/**
+ * A connection with a remote system.
+ */
+public interface Connection extends AutoCloseable<Connection>, ConnectionServiceProvider {
+
+ /**
+ * Directly access a remote service on this connection.
+ *
+ * @param path the path of the service to access
+ * @param config the configuration to use
+ * @return a future handle to a request handler source that accesses the remote service
+ */
+ IoFuture<Handle<RequestHandlerSource>> accessRemoteService(QualifiedName path, ServiceConfiguration config);
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionClient.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionClient.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionClient.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.ChannelSource;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+
+/**
+ *
+ */
+public interface ConnectionClient extends ConnectionServiceProvider {
+ IoFuture<Connection> connect(ChannelSource<AllocatedMessageChannel> channelSource);
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionListener.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionListener.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionListener.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+/**
+ *
+ */
+public interface ConnectionListener {
+ void handleConnection(Connection connection);
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServer.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServer.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServer.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.AutoCloseable;
+import org.jboss.xnio.IoHandlerFactory;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+
+/**
+ *
+ */
+public interface ConnectionServer extends IoHandlerFactory<AllocatedMessageChannel>, ConnectionServiceProvider, AutoCloseable<ConnectionServer> {
+ void addConnectionListener(ConnectionListener connectionListener);
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceListener.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceListener.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceListener.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.SimpleCloseable;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+
+/**
+ *
+ */
+public interface ConnectionServiceListener {
+ void serviceRegistered(SimpleCloseable listenerHandler, ServiceInfo info);
+
+ final class ServiceInfo {
+
+ private String endpointName;
+ private String serviceType;
+ private String groupName;
+ private QualifiedName path;
+ private int metric;
+ private Handle<RequestHandlerSource> requestHandlerSource;
+
+ public ServiceInfo() {
+ }
+
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ public void setEndpointName(final String endpointName) {
+ this.endpointName = endpointName;
+ }
+
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ public void setServiceType(final String serviceType) {
+ this.serviceType = serviceType;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public void setGroupName(final String groupName) {
+ this.groupName = groupName;
+ }
+
+ public QualifiedName getPath() {
+ return path;
+ }
+
+ public void setPath(final QualifiedName path) {
+ this.path = path;
+ }
+
+ public int getMetric() {
+ return metric;
+ }
+
+ public void setMetric(final int metric) {
+ this.metric = metric;
+ }
+
+ public Handle<RequestHandlerSource> getRequestHandlerSource() {
+ return requestHandlerSource;
+ }
+
+ public void setRequestHandlerSource(final Handle<RequestHandlerSource> requestHandlerSource) {
+ this.requestHandlerSource = requestHandlerSource;
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceProvider.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceProvider.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ConnectionServiceProvider.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.RemoteServiceConfiguration;
+import org.jboss.remoting3.SimpleCloseable;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import java.io.IOException;
+import java.io.Closeable;
+
+/**
+ * A connection service provider. Implementations of this interface allow services to be registered at
+ * named locations for remote access.
+ */
+public interface ConnectionServiceProvider extends Closeable {
+
+ void registerMarshaller(String name, MarshallerFactory marshallerFactory, MarshallingConfiguration configuration);
+
+ void unregisterMarshaller(String name);
+
+ /**
+ * Register a service on this connection. When the given handle is closed, the service is unregistered. A
+ * strong reference is maintained to the given handle. The handle will be closed automatically if this provider
+ * is closed.
+ *
+ * @param path the path at which the service should be registered
+ * @param remoteServiceConfiguration the remote service configuration of the service
+ * @param serviceConfiguration the marshalling setup to use
+ * @throws java.io.IOException if the service could not be registered
+ */
+ Handle<RequestHandlerSource> registerService(QualifiedName path, RemoteServiceConfiguration remoteServiceConfiguration, ServiceConfiguration serviceConfiguration) throws IOException;
+
+ /**
+ * Add a connection service listener which is notified whenever a service is registered to this provider. The
+ * returned handle may be used to unregister the listener.
+ *
+ * @param listener the listener
+ * @return a handle which can be used to unregister the listener
+ */
+ SimpleCloseable addServiceListener(ConnectionServiceListener listener);
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/FutureRemoteRequestHandlerSource.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.xnio.AbstractIoFuture;
-import org.jboss.xnio.IoFuture;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import java.io.IOException;
-
-/**
- *
- */
-public final class FutureRemoteRequestHandlerSource extends AbstractIoFuture<RequestHandlerSource> {
-
- public IoFuture<RequestHandlerSource> cancel() {
- return this;
- }
-
- protected boolean setException(final IOException exception) {
- return super.setException(exception);
- }
-
- protected boolean setResult(final RequestHandlerSource result) {
- return super.setResult(result);
- }
-
- public String toString() {
- return "future remote request handler source <" + Integer.toHexString(hashCode()) + ">";
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/FutureRemoteRequestHandlerSource.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/FutureRemoteRequestHandlerSource.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.xnio.AbstractIoFuture;
+import org.jboss.xnio.IoFuture;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import java.io.IOException;
+
+/**
+ *
+ */
+public final class FutureRemoteRequestHandlerSource extends AbstractIoFuture<RequestHandlerSource> {
+
+ public IoFuture<RequestHandlerSource> cancel() {
+ return this;
+ }
+
+ protected boolean setException(final IOException exception) {
+ return super.setException(exception);
+ }
+
+ protected boolean setResult(final RequestHandlerSource result) {
+ return super.setResult(result);
+ }
+
+ public String toString() {
+ return "future remote request handler source <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IdentityHashIntegerBiMap.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,96 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Set;
-import java.util.Collections;
-
-/**
- *
- */
-final class IdentityHashIntegerBiMap<T> implements IntegerBiMap<T> {
-
- private final HashMap<Integer, T> leftMap;
- private final IdentityHashMap<T, Integer> rightMap;
-
- public IdentityHashIntegerBiMap(int initialCapacity, float loadFactor) {
- leftMap = new HashMap<Integer, T>(initialCapacity, loadFactor);
- rightMap = new IdentityHashMap<T, Integer>((int) (initialCapacity / loadFactor));
- }
-
- public IdentityHashIntegerBiMap() {
- this(256, 0.4f);
- }
-
- public int get(final T key, final int defValue) {
- final Integer v = rightMap.get(key);
- return v == null ? defValue : v.intValue();
- }
-
- public T get(final int key) {
- return leftMap.get(Integer.valueOf(key));
- }
-
- public void put(final int key1, final T key2) {
- final Integer key1Obj = Integer.valueOf(key1);
- final T oldKey2 = leftMap.put(key1Obj, key2);
- final Integer oldKey1Obj = rightMap.put(key2, key1Obj);
- rightMap.remove(oldKey2);
- leftMap.remove(oldKey1Obj);
- }
-
- public boolean putIfAbsent(final int key1, final T key2) {
- final Integer key1Obj = Integer.valueOf(key1);
- if (leftMap.containsKey(key1Obj)) {
- return false;
- }
- final T oldKey2 = leftMap.put(key1Obj, key2);
- rightMap.put(key2, key1Obj);
- rightMap.remove(oldKey2);
- return true;
- }
-
- public T remove(final int key) {
- final T oldRightKey = leftMap.remove(Integer.valueOf(key));
- rightMap.remove(oldRightKey);
- return oldRightKey;
- }
-
- public void remove(final T key) {
- leftMap.remove(rightMap.remove(key));
- }
-
- public Set<T> getKeys() {
- return Collections.unmodifiableSet(rightMap.keySet());
- }
-
- public static <T> IntegerBiMap<T> create() {
- return new IdentityHashIntegerBiMap<T>();
- }
-
- public static <T> IntegerBiMap<T> createSynchronizing() {
- return IntegerBiMap.Util.synchronizing(new IdentityHashIntegerBiMap<T>());
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IdentityHashIntegerBiMap.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Set;
+import java.util.Collections;
+
+/**
+ *
+ */
+final class IdentityHashIntegerBiMap<T> implements IntegerBiMap<T> {
+
+ private final HashMap<Integer, T> leftMap;
+ private final IdentityHashMap<T, Integer> rightMap;
+
+ public IdentityHashIntegerBiMap(int initialCapacity, float loadFactor) {
+ leftMap = new HashMap<Integer, T>(initialCapacity, loadFactor);
+ rightMap = new IdentityHashMap<T, Integer>((int) (initialCapacity / loadFactor));
+ }
+
+ public IdentityHashIntegerBiMap() {
+ this(256, 0.4f);
+ }
+
+ public int get(final T key, final int defValue) {
+ final Integer v = rightMap.get(key);
+ return v == null ? defValue : v.intValue();
+ }
+
+ public T get(final int key) {
+ return leftMap.get(Integer.valueOf(key));
+ }
+
+ public void put(final int key1, final T key2) {
+ final Integer key1Obj = Integer.valueOf(key1);
+ final T oldKey2 = leftMap.put(key1Obj, key2);
+ final Integer oldKey1Obj = rightMap.put(key2, key1Obj);
+ rightMap.remove(oldKey2);
+ leftMap.remove(oldKey1Obj);
+ }
+
+ public boolean putIfAbsent(final int key1, final T key2) {
+ final Integer key1Obj = Integer.valueOf(key1);
+ if (leftMap.containsKey(key1Obj)) {
+ return false;
+ }
+ final T oldKey2 = leftMap.put(key1Obj, key2);
+ rightMap.put(key2, key1Obj);
+ rightMap.remove(oldKey2);
+ return true;
+ }
+
+ public T remove(final int key) {
+ final T oldRightKey = leftMap.remove(Integer.valueOf(key));
+ rightMap.remove(oldRightKey);
+ return oldRightKey;
+ }
+
+ public void remove(final T key) {
+ leftMap.remove(rightMap.remove(key));
+ }
+
+ public Set<T> getKeys() {
+ return Collections.unmodifiableSet(rightMap.keySet());
+ }
+
+ public static <T> IntegerBiMap<T> create() {
+ return new IdentityHashIntegerBiMap<T>();
+ }
+
+ public static <T> IntegerBiMap<T> createSynchronizing() {
+ return IntegerBiMap.Util.synchronizing(new IdentityHashIntegerBiMap<T>());
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IdentityHashIntegerResourceBiMap.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Collections;
-import java.util.Collection;
-import org.jboss.remoting.spi.AutoCloseable;
-import org.jboss.remoting.spi.Handle;
-
-/**
- *
- */
-final class IdentityHashIntegerResourceBiMap<T extends AutoCloseable<T>> implements IntegerResourceBiMap<T> {
-
- private final HashMap<Integer, Handle<T>> leftMap;
- private final IdentityHashMap<T, Integer> rightMap;
-
- public IdentityHashIntegerResourceBiMap(int initialCapacity, float loadFactor) {
- leftMap = new HashMap<Integer, Handle<T>>(initialCapacity, loadFactor);
- rightMap = new IdentityHashMap<T, Integer>((int) (initialCapacity / loadFactor));
- }
-
- public IdentityHashIntegerResourceBiMap() {
- this(256, 0.4f);
- }
-
- public int get(final T key, final int defValue) {
- final Integer v = rightMap.get(key);
- return v == null ? defValue : v.intValue();
- }
-
- public Handle<T> get(final int key) {
- return leftMap.get(Integer.valueOf(key));
- }
-
- public void put(final int key1, final Handle<T> key2) {
- final Integer key1Obj = Integer.valueOf(key1);
- final Handle<T> oldKey2 = leftMap.put(key1Obj, key2);
- final Integer oldKey1Obj = rightMap.put(key2.getResource(), key1Obj);
- if (oldKey2 != null) rightMap.remove(oldKey2.getResource());
- if (oldKey1Obj != null) leftMap.remove(oldKey1Obj);
- }
-
- public Handle<T> remove(final int key) {
- final Handle<T> oldRightKey = leftMap.remove(Integer.valueOf(key));
- if (oldRightKey != null) rightMap.remove(oldRightKey.getResource());
- return oldRightKey;
- }
-
- public void remove(final T key) {
- leftMap.remove(rightMap.remove(key));
- }
-
- public Collection<Handle<T>> getKeys() {
- return Collections.unmodifiableCollection(leftMap.values());
- }
-
- public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> create() {
- return new IdentityHashIntegerResourceBiMap<T>();
- }
-
- public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> createSynchronizing() {
- return Util.synchronizing(new IdentityHashIntegerResourceBiMap<T>());
- }
-
- public Iterator<Handle<T>> iterator() {
- final Iterator<Map.Entry<Integer, Handle<T>>> delegate = leftMap.entrySet().iterator();
- return new Iterator<Handle<T>>() {
- private Map.Entry<Integer, Handle<T>> current;
-
- public boolean hasNext() {
- return delegate.hasNext();
- }
-
- public Handle<T> next() {
- current = delegate.next();
- return current.getValue();
- }
-
- public void remove() {
- delegate.remove();
- rightMap.remove(current.getValue().getResource());
- }
- };
- }
-}
\ No newline at end of file
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IdentityHashIntegerResourceBiMap.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IdentityHashIntegerResourceBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,110 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Collections;
+import java.util.Collection;
+import org.jboss.remoting3.spi.AutoCloseable;
+import org.jboss.remoting3.spi.Handle;
+
+/**
+ *
+ */
+final class IdentityHashIntegerResourceBiMap<T extends AutoCloseable<T>> implements IntegerResourceBiMap<T> {
+
+ private final HashMap<Integer, Handle<T>> leftMap;
+ private final IdentityHashMap<T, Integer> rightMap;
+
+ public IdentityHashIntegerResourceBiMap(int initialCapacity, float loadFactor) {
+ leftMap = new HashMap<Integer, Handle<T>>(initialCapacity, loadFactor);
+ rightMap = new IdentityHashMap<T, Integer>((int) (initialCapacity / loadFactor));
+ }
+
+ public IdentityHashIntegerResourceBiMap() {
+ this(256, 0.4f);
+ }
+
+ public int get(final T key, final int defValue) {
+ final Integer v = rightMap.get(key);
+ return v == null ? defValue : v.intValue();
+ }
+
+ public Handle<T> get(final int key) {
+ return leftMap.get(Integer.valueOf(key));
+ }
+
+ public void put(final int key1, final Handle<T> key2) {
+ final Integer key1Obj = Integer.valueOf(key1);
+ final Handle<T> oldKey2 = leftMap.put(key1Obj, key2);
+ final Integer oldKey1Obj = rightMap.put(key2.getResource(), key1Obj);
+ if (oldKey2 != null) rightMap.remove(oldKey2.getResource());
+ if (oldKey1Obj != null) leftMap.remove(oldKey1Obj);
+ }
+
+ public Handle<T> remove(final int key) {
+ final Handle<T> oldRightKey = leftMap.remove(Integer.valueOf(key));
+ if (oldRightKey != null) rightMap.remove(oldRightKey.getResource());
+ return oldRightKey;
+ }
+
+ public void remove(final T key) {
+ leftMap.remove(rightMap.remove(key));
+ }
+
+ public Collection<Handle<T>> getKeys() {
+ return Collections.unmodifiableCollection(leftMap.values());
+ }
+
+ public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> create() {
+ return new IdentityHashIntegerResourceBiMap<T>();
+ }
+
+ public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> createSynchronizing() {
+ return Util.synchronizing(new IdentityHashIntegerResourceBiMap<T>());
+ }
+
+ public Iterator<Handle<T>> iterator() {
+ final Iterator<Map.Entry<Integer, Handle<T>>> delegate = leftMap.entrySet().iterator();
+ return new Iterator<Handle<T>>() {
+ private Map.Entry<Integer, Handle<T>> current;
+
+ public boolean hasNext() {
+ return delegate.hasNext();
+ }
+
+ public Handle<T> next() {
+ current = delegate.next();
+ return current.getValue();
+ }
+
+ public void remove() {
+ delegate.remove();
+ rightMap.remove(current.getValue().getResource());
+ }
+ };
+ }
+}
\ No newline at end of file
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IntegerBiMap.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.core.util.SynchronizedSet;
-import java.util.Set;
-
-/**
- *
- */
-interface IntegerBiMap<T> {
- int get(T key, int defValue);
-
- T get(int key);
-
- void put(int key1, T key2);
-
- boolean putIfAbsent(int key1, T key2);
-
- T remove(int key);
-
- void remove(T key);
-
- Set<T> getKeys();
-
- class Util {
-
- private Util() {
- }
-
- private static class SyncWrapper<T> implements IntegerBiMap<T> {
-
- private final IntegerBiMap<T> orig;
- private final Object lock;
-
- private SyncWrapper(IntegerBiMap<T> orig, Object lock) {
- this.orig = orig;
- this.lock = lock;
- }
-
- public int get(final T key, final int defValue) {
- synchronized (lock) {
- return orig.get(key, defValue);
- }
- }
-
- public T get(final int key) {
- synchronized (lock) {
- return orig.get(key);
- }
- }
-
- public void put(final int key1, final T key2) {
- synchronized (lock) {
- orig.put(key1, key2);
- }
- }
-
- public boolean putIfAbsent(final int key1, final T key2) {
- synchronized (lock) {
- return orig.putIfAbsent(key1, key2);
- }
- }
-
- public T remove(final int key) {
- synchronized (lock) {
- return orig.remove(key);
- }
- }
-
- public void remove(final T key) {
- synchronized (lock) {
- orig.remove(key);
- }
- }
-
- public Set<T> getKeys() {
- return new SynchronizedSet<T>(orig.getKeys(), lock);
- }
- }
-
- public static <T> IntegerBiMap<T> synchronizing(IntegerBiMap<T> orig) {
- return new SyncWrapper<T>(orig, new Object());
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IntegerBiMap.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.util.Set;
+
+/**
+ *
+ */
+interface IntegerBiMap<T> {
+ int get(T key, int defValue);
+
+ T get(int key);
+
+ void put(int key1, T key2);
+
+ boolean putIfAbsent(int key1, T key2);
+
+ T remove(int key);
+
+ void remove(T key);
+
+ Set<T> getKeys();
+
+ class Util {
+
+ private Util() {
+ }
+
+ private static class SyncWrapper<T> implements IntegerBiMap<T> {
+
+ private final IntegerBiMap<T> orig;
+ private final Object lock;
+
+ private SyncWrapper(IntegerBiMap<T> orig, Object lock) {
+ this.orig = orig;
+ this.lock = lock;
+ }
+
+ public int get(final T key, final int defValue) {
+ synchronized (lock) {
+ return orig.get(key, defValue);
+ }
+ }
+
+ public T get(final int key) {
+ synchronized (lock) {
+ return orig.get(key);
+ }
+ }
+
+ public void put(final int key1, final T key2) {
+ synchronized (lock) {
+ orig.put(key1, key2);
+ }
+ }
+
+ public boolean putIfAbsent(final int key1, final T key2) {
+ synchronized (lock) {
+ return orig.putIfAbsent(key1, key2);
+ }
+ }
+
+ public T remove(final int key) {
+ synchronized (lock) {
+ return orig.remove(key);
+ }
+ }
+
+ public void remove(final T key) {
+ synchronized (lock) {
+ orig.remove(key);
+ }
+ }
+
+ public Set<T> getKeys() {
+ return new SynchronizedSet<T>(orig.getKeys(), lock);
+ }
+ }
+
+ public static <T> IntegerBiMap<T> synchronizing(IntegerBiMap<T> orig) {
+ return new SyncWrapper<T>(orig, new Object());
+ }
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IntegerResourceBiMap.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.spi.AutoCloseable;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.core.util.SynchronizedCollection;
-import java.util.Iterator;
-import java.util.Collection;
-
-/**
- *
- */
-interface IntegerResourceBiMap<T extends AutoCloseable<T>> extends Iterable<Handle<T>> {
- int get(T key, int defValue);
-
- Handle<T> get(int key);
-
- void put(int key1, Handle<T> key2);
-
- Handle<T> remove(int key);
-
- void remove(T key);
-
- Collection<Handle<T>> getKeys();
-
- class Util {
-
- private Util() {
- }
-
- private static class SyncWrapper<T extends AutoCloseable<T>> implements IntegerResourceBiMap<T> {
-
- private final IntegerResourceBiMap<T> orig;
- private final Object lock;
-
- private SyncWrapper(IntegerResourceBiMap<T> orig, Object lock) {
- this.orig = orig;
- this.lock = lock;
- }
-
- public int get(final T key, final int defValue) {
- synchronized (lock) {
- return orig.get(key, defValue);
- }
- }
-
- public Handle<T> get(final int key) {
- synchronized (lock) {
- return orig.get(key);
- }
- }
-
- public void put(final int key1, final Handle<T> key2) {
- synchronized (lock) {
- orig.put(key1, key2);
- }
- }
-
- public Handle<T> remove(final int key) {
- synchronized (lock) {
- return orig.remove(key);
- }
- }
-
- public void remove(final T key) {
- synchronized (lock) {
- orig.remove(key);
- }
- }
-
- public Collection<Handle<T>> getKeys() {
- return new SynchronizedCollection<Handle<T>>(orig.getKeys(), lock);
- }
-
- public Iterator<Handle<T>> iterator() {
- return null;
- }
- }
-
- public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> synchronizing(IntegerResourceBiMap<T> orig) {
- return new SyncWrapper<T>(orig, new Object());
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/IntegerResourceBiMap.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/IntegerResourceBiMap.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.AutoCloseable;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.core.util.SynchronizedCollection;
+import java.util.Iterator;
+import java.util.Collection;
+
+/**
+ *
+ */
+interface IntegerResourceBiMap<T extends AutoCloseable<T>> extends Iterable<Handle<T>> {
+ int get(T key, int defValue);
+
+ Handle<T> get(int key);
+
+ void put(int key1, Handle<T> key2);
+
+ Handle<T> remove(int key);
+
+ void remove(T key);
+
+ Collection<Handle<T>> getKeys();
+
+ class Util {
+
+ private Util() {
+ }
+
+ private static class SyncWrapper<T extends AutoCloseable<T>> implements IntegerResourceBiMap<T> {
+
+ private final IntegerResourceBiMap<T> orig;
+ private final Object lock;
+
+ private SyncWrapper(IntegerResourceBiMap<T> orig, Object lock) {
+ this.orig = orig;
+ this.lock = lock;
+ }
+
+ public int get(final T key, final int defValue) {
+ synchronized (lock) {
+ return orig.get(key, defValue);
+ }
+ }
+
+ public Handle<T> get(final int key) {
+ synchronized (lock) {
+ return orig.get(key);
+ }
+ }
+
+ public void put(final int key1, final Handle<T> key2) {
+ synchronized (lock) {
+ orig.put(key1, key2);
+ }
+ }
+
+ public Handle<T> remove(final int key) {
+ synchronized (lock) {
+ return orig.remove(key);
+ }
+ }
+
+ public void remove(final T key) {
+ synchronized (lock) {
+ orig.remove(key);
+ }
+ }
+
+ public Collection<Handle<T>> getKeys() {
+ return new SynchronizedCollection<Handle<T>>(orig.getKeys(), lock);
+ }
+
+ public Iterator<Handle<T>> iterator() {
+ return null;
+ }
+ }
+
+ public static <T extends AutoCloseable<T>> IntegerResourceBiMap<T> synchronizing(IntegerResourceBiMap<T> orig) {
+ return new SyncWrapper<T>(orig, new Object());
+ }
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MessageType.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,113 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-/**
- * The type of a protocol message.
- */
-enum MessageType {
-
- /**
- * Signals that the connection should be closed in an orderly fashion. After this message is sent, no further
- * requests or service advertisements may be sent.
- */
- CONNECTION_CLOSE(0x00),
- /**
- * The request part of a request-response sequence, sent from the Client to the RequestListener.
- */
- REQUEST(0x10),
- /**
- * The reply part of a request-response sequence, sent from the RequestListener to the Client.
- */
- REPLY(0x11),
- /**
- * A cancellation request for an outstanding request, sent from the Client to the RequestListener.
- */
- CANCEL_REQUEST(0x12),
- /**
- * Acknowlegement that a request was cancelled, sent from the RequestListener to the Client.
- */
- CANCEL_ACK(0x13),
- /**
- * Message that the request could not be received on the remote end, sent from to the Client from the
- * protocol handler.
- */
- REQUEST_RECEIVE_FAILED(0x14),
- // Request failed due to exception
- REQUEST_FAILED(0x15),
- // Remote side called .close() on a forwarded RequestHandler
- CLIENT_CLOSE(0x20),
- // Remote side pulled a new RequestHandler off of a forwarded RequestHandlerSource
- CLIENT_OPEN(0x21),
- // Request to open a service at a path
- SERVICE_OPEN_REQUEST(0x30),
- // Reply for a successful service open
- SERVICE_OPEN_REPLY(0x31),
- // Reply for a generally failed service open
- SERVICE_OPEN_FAILED(0x32),
- SERVICE_OPEN_NOT_FOUND(0x33),
- SERVICE_OPEN_FORBIDDEN(0x34),
-
- // Notify the remote side that the service will no longer be used
- SERVICE_CLOSE_REQUEST(0x3e),
- // The service channel is closed; no further clients may be opened
- SERVICE_CLOSE_NOTIFY(0x3f),
- ;
- private final int id;
-
- private MessageType(int id) {
- this.id = id;
- }
-
- public int getId() {
- return id;
- }
-
- /**
- * Get the message type for an integer ID.
- *
- * @param id the integer ID
- * @return the message type instance
- */
- public static MessageType getMessageType(final int id) {
- switch (id) {
- case 0x00: return CONNECTION_CLOSE;
- case 0x10: return REQUEST;
- case 0x11: return REPLY;
- case 0x12: return CANCEL_REQUEST;
- case 0x13: return CANCEL_ACK;
- case 0x14: return REQUEST_RECEIVE_FAILED;
- case 0x15: return REQUEST_FAILED;
- case 0x20: return CLIENT_CLOSE;
- case 0x21: return CLIENT_OPEN;
- case 0x30: return SERVICE_OPEN_REQUEST;
- case 0x31: return SERVICE_OPEN_REPLY;
- case 0x32: return SERVICE_OPEN_FAILED;
- case 0x33: return SERVICE_OPEN_NOT_FOUND;
- case 0x34: return SERVICE_OPEN_FORBIDDEN;
- case 0x3e: return SERVICE_CLOSE_REQUEST;
- case 0x3f: return SERVICE_CLOSE_NOTIFY;
- default: throw new IllegalArgumentException("Invalid message type ID");
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MessageType.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MessageType.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,113 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+/**
+ * The type of a protocol message.
+ */
+enum MessageType {
+
+ /**
+ * Signals that the connection should be closed in an orderly fashion. After this message is sent, no further
+ * requests or service advertisements may be sent.
+ */
+ CONNECTION_CLOSE(0x00),
+ /**
+ * The request part of a request-response sequence, sent from the Client to the RequestListener.
+ */
+ REQUEST(0x10),
+ /**
+ * The reply part of a request-response sequence, sent from the RequestListener to the Client.
+ */
+ REPLY(0x11),
+ /**
+ * A cancellation request for an outstanding request, sent from the Client to the RequestListener.
+ */
+ CANCEL_REQUEST(0x12),
+ /**
+ * Acknowlegement that a request was cancelled, sent from the RequestListener to the Client.
+ */
+ CANCEL_ACK(0x13),
+ /**
+ * Message that the request could not be received on the remote end, sent from to the Client from the
+ * protocol handler.
+ */
+ REQUEST_RECEIVE_FAILED(0x14),
+ // Request failed due to exception
+ REQUEST_FAILED(0x15),
+ // Remote side called .close() on a forwarded RequestHandler
+ CLIENT_CLOSE(0x20),
+ // Remote side pulled a new RequestHandler off of a forwarded RequestHandlerSource
+ CLIENT_OPEN(0x21),
+ // Request to open a service at a path
+ SERVICE_OPEN_REQUEST(0x30),
+ // Reply for a successful service open
+ SERVICE_OPEN_REPLY(0x31),
+ // Reply for a generally failed service open
+ SERVICE_OPEN_FAILED(0x32),
+ SERVICE_OPEN_NOT_FOUND(0x33),
+ SERVICE_OPEN_FORBIDDEN(0x34),
+
+ // Notify the remote side that the service will no longer be used
+ SERVICE_CLOSE_REQUEST(0x3e),
+ // The service channel is closed; no further clients may be opened
+ SERVICE_CLOSE_NOTIFY(0x3f),
+ ;
+ private final int id;
+
+ private MessageType(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ /**
+ * Get the message type for an integer ID.
+ *
+ * @param id the integer ID
+ * @return the message type instance
+ */
+ public static MessageType getMessageType(final int id) {
+ switch (id) {
+ case 0x00: return CONNECTION_CLOSE;
+ case 0x10: return REQUEST;
+ case 0x11: return REPLY;
+ case 0x12: return CANCEL_REQUEST;
+ case 0x13: return CANCEL_ACK;
+ case 0x14: return REQUEST_RECEIVE_FAILED;
+ case 0x15: return REQUEST_FAILED;
+ case 0x20: return CLIENT_CLOSE;
+ case 0x21: return CLIENT_OPEN;
+ case 0x30: return SERVICE_OPEN_REQUEST;
+ case 0x31: return SERVICE_OPEN_REPLY;
+ case 0x32: return SERVICE_OPEN_FAILED;
+ case 0x33: return SERVICE_OPEN_NOT_FOUND;
+ case 0x34: return SERVICE_OPEN_FORBIDDEN;
+ case 0x3e: return SERVICE_CLOSE_REQUEST;
+ case 0x3f: return SERVICE_CLOSE_NOTIFY;
+ default: throw new IllegalArgumentException("Invalid message type ID");
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Multiplex.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Multiplex.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/Multiplex.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+/**
+ *
+ */
+public final class Multiplex {
+ private Multiplex() {}
+
+ /**
+ * Create a new multiplex connector.
+ *
+ * @return the connector
+ */
+ public static ConnectionClient createConnector() {
+
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConfiguration.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,156 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import java.util.concurrent.Executor;
-import java.nio.ByteBuffer;
-import org.jboss.xnio.BufferAllocator;
-import org.jboss.marshalling.MarshallerFactory;
-import org.jboss.marshalling.MarshallingConfiguration;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-
-/**
- * A configuration object for the multiplex protocol.
- */
-public final class MultiplexConfiguration {
- private MarshallerFactory marshallerFactory;
- private MarshallingConfiguration marshallingConfiguration;
- private int linkMetric;
- private Executor executor;
- private BufferAllocator<ByteBuffer> allocator;
- private NamedServiceRegistry namedServiceRegistry;
-
- /**
- * Construct a new instance.
- */
- public MultiplexConfiguration() {
- }
-
- /**
- * Get the marshaller factory to use for messages transmitted and received by this multiplex connection.
- *
- * @return the marshaller factory
- */
- public MarshallerFactory getMarshallerFactory() {
- return marshallerFactory;
- }
-
- /**
- * Set the marshaller factory to use for messages transmitted and received by this multiplex connection.
- *
- * @param marshallerFactory the marshaller factory
- */
- public void setMarshallerFactory(final MarshallerFactory marshallerFactory) {
- this.marshallerFactory = marshallerFactory;
- }
-
- /**
- * Get the marshaller configuration to pass into the marshaller factory.
- *
- * @return the configuration
- */
- public MarshallingConfiguration getMarshallingConfiguration() {
- return marshallingConfiguration;
- }
-
- /**
- * Set the marshaller configuration to pass into the marshaller factory.
- *
- * @param marshallingConfiguration the configuration
- */
- public void setMarshallingConfiguration(final MarshallingConfiguration marshallingConfiguration) {
- this.marshallingConfiguration = marshallingConfiguration;
- }
-
- /**
- * Get the link metric to assign to this multiplex connection.
- *
- * @return the link metric
- */
- public int getLinkMetric() {
- return linkMetric;
- }
-
- /**
- * Set the link metric to assign to this multiplex connection.
- *
- * @param linkMetric the link metric
- */
- public void setLinkMetric(final int linkMetric) {
- this.linkMetric = linkMetric;
- }
-
- /**
- * Get the executor to use to execute handlers.
- *
- * @return the executor
- */
- public Executor getExecutor() {
- return executor;
- }
-
- /**
- * Set the executor to use to execute handlers.
- *
- * @param executor the executor
- */
- public void setExecutor(final Executor executor) {
- this.executor = executor;
- }
-
- /**
- * Get the buffer allocator to use for outbound messages on this connection.
- *
- * @return the allocator
- */
- public BufferAllocator<ByteBuffer> getAllocator() {
- return allocator;
- }
-
- /**
- * Set the buffer allocator to use for outbound messages on this connection.
- *
- * @param allocator the allocator
- */
- public void setAllocator(final BufferAllocator<ByteBuffer> allocator) {
- this.allocator = allocator;
- }
-
- /**
- * Get the named service registry for this connection.
- *
- * @return the registry
- */
- public NamedServiceRegistry getNamedServiceRegistry() {
- return namedServiceRegistry;
- }
-
- /**
- * Set the named service registry for this connection.
- *
- * @param namedServiceRegistry the registry
- */
- public void setNamedServiceRegistry(final NamedServiceRegistry namedServiceRegistry) {
- this.namedServiceRegistry = namedServiceRegistry;
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConfiguration.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConfiguration.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,156 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.util.concurrent.Executor;
+import java.nio.ByteBuffer;
+import org.jboss.xnio.BufferAllocator;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+
+/**
+ * A configuration object for the multiplex protocol.
+ */
+public final class MultiplexConfiguration {
+ private MarshallerFactory marshallerFactory;
+ private MarshallingConfiguration marshallingConfiguration;
+ private int linkMetric;
+ private Executor executor;
+ private BufferAllocator<ByteBuffer> allocator;
+ private NamedServiceRegistry namedServiceRegistry;
+
+ /**
+ * Construct a new instance.
+ */
+ public MultiplexConfiguration() {
+ }
+
+ /**
+ * Get the marshaller factory to use for messages transmitted and received by this multiplex connection.
+ *
+ * @return the marshaller factory
+ */
+ public MarshallerFactory getMarshallerFactory() {
+ return marshallerFactory;
+ }
+
+ /**
+ * Set the marshaller factory to use for messages transmitted and received by this multiplex connection.
+ *
+ * @param marshallerFactory the marshaller factory
+ */
+ public void setMarshallerFactory(final MarshallerFactory marshallerFactory) {
+ this.marshallerFactory = marshallerFactory;
+ }
+
+ /**
+ * Get the marshaller configuration to pass into the marshaller factory.
+ *
+ * @return the configuration
+ */
+ public MarshallingConfiguration getMarshallingConfiguration() {
+ return marshallingConfiguration;
+ }
+
+ /**
+ * Set the marshaller configuration to pass into the marshaller factory.
+ *
+ * @param marshallingConfiguration the configuration
+ */
+ public void setMarshallingConfiguration(final MarshallingConfiguration marshallingConfiguration) {
+ this.marshallingConfiguration = marshallingConfiguration;
+ }
+
+ /**
+ * Get the link metric to assign to this multiplex connection.
+ *
+ * @return the link metric
+ */
+ public int getLinkMetric() {
+ return linkMetric;
+ }
+
+ /**
+ * Set the link metric to assign to this multiplex connection.
+ *
+ * @param linkMetric the link metric
+ */
+ public void setLinkMetric(final int linkMetric) {
+ this.linkMetric = linkMetric;
+ }
+
+ /**
+ * Get the executor to use to execute handlers.
+ *
+ * @return the executor
+ */
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ /**
+ * Set the executor to use to execute handlers.
+ *
+ * @param executor the executor
+ */
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ /**
+ * Get the buffer allocator to use for outbound messages on this connection.
+ *
+ * @return the allocator
+ */
+ public BufferAllocator<ByteBuffer> getAllocator() {
+ return allocator;
+ }
+
+ /**
+ * Set the buffer allocator to use for outbound messages on this connection.
+ *
+ * @param allocator the allocator
+ */
+ public void setAllocator(final BufferAllocator<ByteBuffer> allocator) {
+ this.allocator = allocator;
+ }
+
+ /**
+ * Get the named service registry for this connection.
+ *
+ * @return the registry
+ */
+ public NamedServiceRegistry getNamedServiceRegistry() {
+ return namedServiceRegistry;
+ }
+
+ /**
+ * Set the named service registry for this connection.
+ *
+ * @param namedServiceRegistry the registry
+ */
+ public void setNamedServiceRegistry(final NamedServiceRegistry namedServiceRegistry) {
+ this.namedServiceRegistry = namedServiceRegistry;
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,455 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.marshalling.MarshallerFactory;
-import org.jboss.marshalling.MarshallingConfiguration;
-import org.jboss.xnio.BufferAllocator;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.Buffers;
-import org.jboss.xnio.log.Logger;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.remoting.spi.AbstractHandleableCloseable;
-import org.jboss.remoting.QualifiedName;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.IndeterminateOutcomeException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.List;
-import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-
-/**
- *
- */
-public final class MultiplexConnection extends AbstractHandleableCloseable<MultiplexConnection> {
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex");
-
- //--== Connection configuration items ==--
- private final MarshallerFactory marshallerFactory;
- private final MarshallingConfiguration marshallingConfiguration;
- private final int linkMetric;
- private final Executor executor;
- // buffer allocator for outbound message assembly
- private final BufferAllocator<ByteBuffer> allocator;
-
- // running on remote node
- private final IntegerBiMap<ReplyHandler> remoteRequests = IdentityHashIntegerBiMap.createSynchronizing();
- // running on local node
- private final IntegerBiMap<RemoteRequestContext> localRequests = IdentityHashIntegerBiMap.createSynchronizing();
- // sequence for remote requests
- private final AtomicInteger requestSequence = new AtomicInteger();
-
- // clients whose requests get forwarded to the remote side
- // even #s were opened from services forwarded to us (our sequence)
- // odd #s were forwarded directly to us (remote sequence)
- private final IntegerBiMap<RequestHandler> remoteClients = IdentityHashIntegerBiMap.createSynchronizing();
- // forwarded to remote side (handled on this side)
- private final IntegerResourceBiMap<RequestHandler> forwardedClients = IdentityHashIntegerResourceBiMap.createSynchronizing();
- // sequence for forwarded clients (shift left one bit, add one, limit is 2^30)
- private final AtomicInteger forwardedClientSequence = new AtomicInteger();
- // sequence for clients created from services forwarded to us (shift left one bit, limit is 2^30)
- private final AtomicInteger remoteClientSequence = new AtomicInteger();
-
- // services on the remote side
- private final IntegerBiMap<FutureRemoteRequestHandlerSource> remoteServices = IdentityHashIntegerBiMap.createSynchronizing();
- // forwarded to remote side (handled on this side)
- private final IntegerResourceBiMap<RequestHandlerSource> forwardedServices = IdentityHashIntegerResourceBiMap.createSynchronizing();
- // sequence for remote services
- private final AtomicInteger remoteServiceSequence = new AtomicInteger();
-
- // registered services by path
- private final NamedServiceRegistry namedServiceRegistry;
-
- private final Endpoint endpoint;
-
- private final AllocatedMessageChannel channel;
-
- public MultiplexConnection(final Endpoint endpoint, final AllocatedMessageChannel channel, final MultiplexConfiguration configuration) {
- super(configuration.getExecutor());
- this.endpoint = endpoint;
- this.channel = channel;
- marshallerFactory = configuration.getMarshallerFactory();
- if (marshallerFactory == null) {
- throw new NullPointerException("marshallerFactory is null");
- }
- marshallingConfiguration = configuration.getMarshallingConfiguration();
- if (marshallingConfiguration == null) {
- throw new NullPointerException("marshallingConfiguration is null");
- }
- linkMetric = configuration.getLinkMetric();
- executor = configuration.getExecutor();
- if (executor == null) {
- throw new NullPointerException("executor is null");
- }
- allocator = configuration.getAllocator();
- if (allocator == null) {
- throw new NullPointerException("allocator is null");
- }
- namedServiceRegistry = configuration.getNamedServiceRegistry();
- if (namedServiceRegistry == null) {
- throw new NullPointerException("namedServiceRegistry is null");
- }
- }
-
- // sequence methods
-
- int nextRequest() {
- return requestSequence.getAndIncrement() & 0x7fffffff;
- }
-
- int nextForwardedClient() {
- return (forwardedClientSequence.getAndIncrement() << 1 | 1) & 0x7fffffff;
- }
-
- int nextRemoteClient() {
- return remoteClientSequence.getAndIncrement() << 1 & 0x7fffffff;
- }
-
- int nextRemoteService() {
- return remoteServiceSequence.getAndIncrement() & 0x7fffffff;
- }
-
- void doBlockingWrite(ByteBuffer... buffers) throws IOException {
- log.trace("Sending message:\n%s", new MultiDumper(buffers));
- if (buffers.length == 1) doBlockingWrite(buffers[0]); else for (;;) {
- if (channel.send(buffers)) {
- return;
- }
- channel.awaitWritable();
- }
- }
-
- private static final class MultiDumper {
- private final ByteBuffer[] buffers;
-
- public MultiDumper(final ByteBuffer[] buffers) {
- this.buffers = buffers;
- }
-
- public String toString() {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < buffers.length; i++) {
- ByteBuffer buffer = buffers[i];
- builder.append("Buffer ");
- builder.append(i);
- builder.append(":\n");
- try {
- Buffers.dump(buffer, builder, 8, 1);
- } catch (IOException e) {
- // ignore
- }
- }
- return builder.toString();
- }
- }
-
- void doBlockingWrite(ByteBuffer buffer) throws IOException {
- log.trace("Sending message:\n%s", Buffers.createDumper(buffer, 8, 1));
- for (;;) {
- if (channel.send(buffer)) {
- return;
- }
- channel.awaitWritable();
- }
- }
-
- void doBlockingWrite(List<ByteBuffer> buffers) throws IOException {
- doBlockingWrite(buffers.toArray(new ByteBuffer[buffers.size()]));
- }
-
- MarshallerFactory getMarshallerFactory() {
- return marshallerFactory;
- }
-
- MarshallingConfiguration getMarshallingConfiguration() {
- return marshallingConfiguration;
- }
-
- int getLinkMetric() {
- return linkMetric;
- }
-
- protected Executor getExecutor() {
- return executor;
- }
-
- BufferAllocator<ByteBuffer> getAllocator() {
- return allocator;
- }
-
- Endpoint getEndpoint() {
- return endpoint;
- }
-
- AllocatedMessageChannel getChannel() {
- return channel;
- }
-
- void removeRemoteClient(final int identifier) {
- remoteClients.remove(identifier);
- }
-
- void addRemoteRequest(final int id, final ReplyHandler handler) {
- remoteRequests.put(id, handler);
- }
-
- void addRemoteClient(final int id, final RequestHandler handler) {
- remoteClients.put(id, handler);
- }
-
- Handle<RequestHandler> getForwardedClient(final int id) {
- return forwardedClients.get(id);
- }
-
- ReplyHandler removeRemoteRequest(final int id) {
- return remoteRequests.remove(id);
- }
-
- RemoteRequestContext getLocalRequest(final int id) {
- return localRequests.get(id);
- }
-
- ReplyHandler getRemoteRequest(final int id) {
- return remoteRequests.get(id);
- }
-
- Handle<RequestHandler> removeForwardedClient(final int id) {
- return forwardedClients.remove(id);
- }
-
- Handle<RequestHandlerSource> getForwardedService(final int id) {
- return forwardedServices.get(id);
- }
-
- void addForwardedClient(final int id, final Handle<RequestHandler> handle) {
- forwardedClients.put(id, handle);
- }
-
- void addForwadedService(final int id, final Handle<RequestHandlerSource> service) {
- forwardedServices.put(id, service);
- }
-
- Handle<RequestHandlerSource> removeForwardedService(final int id) {
- return forwardedServices.remove(id);
- }
-
- Handle<RequestHandlerSource> getServiceByPath(String path) {
- return getService(QualifiedName.parse(path));
- }
-
- Handle<RequestHandlerSource> getService(final QualifiedName name) {
- return namedServiceRegistry.lookupService(name);
- }
-
- FutureRemoteRequestHandlerSource getFutureRemoteService(final int id) {
- return remoteServices.get(id);
- }
-
- FutureRemoteRequestHandlerSource removeFutureRemoteService(final int id) {
- return remoteServices.remove(id);
- }
-
- public Handle<RequestHandlerSource> openRemoteService(final QualifiedName name) throws IOException {
- log.trace("Sending request to open remote service \"%s\"", name);
- final FutureRemoteRequestHandlerSource future = new FutureRemoteRequestHandlerSource();
- int id;
- for (;;) {
- id = nextRemoteService();
- if (remoteServices.putIfAbsent(id, future)) {
- break;
- }
- }
- ByteBuffer buffer = ByteBuffer.allocate(5 + getByteLength(name));
- buffer.put((byte) MessageType.SERVICE_OPEN_REQUEST.getId());
- buffer.putInt(id);
- putQualifiedName(buffer, name);
- buffer.flip();
- doBlockingWrite(buffer);
- try {
- final Handle<RequestHandlerSource> handle = future.getInterruptibly().getHandle();
- log.trace("Opened %s", handle);
- return handle;
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new InterruptedIOException("Interrupted while waiting for remote service");
- }
- }
-
- static int getByteLength(QualifiedName name) {
- int cnt = 2; // short header
- for (String s : name) {
- cnt += getByteLength(s);
- }
- return cnt;
- }
-
- static int getByteLength(String s) {
- final int len = s.length();
- int cnt = 0;
- for (int i = 0; i < len; i++) {
- char ch = s.charAt(i);
- if (ch > 0 && ch <= 0x7f) {
- cnt ++;
- } else if (ch <= 0x07ff) {
- cnt += 2;
- } else {
- cnt += 3;
- }
- }
- // null terminator...
- cnt ++;
- return cnt;
- }
-
- static String getString(final ByteBuffer buffer) {
- StringBuilder builder = new StringBuilder();
- int state = 0, a = 0;
- while (buffer.hasRemaining()) {
- final int v = buffer.get() & 0xff;
- switch (state) {
- case 0: {
- if (v == 0) {
- return builder.toString();
- } else if (v < 128) {
- builder.append((char) v);
- } else if (192 <= v && v < 224) {
- a = v << 6;
- state = 1;
- } else if (224 <= v && v < 232) {
- a = v << 12;
- state = 2;
- } else {
- builder.append('?');
- }
- break;
- }
- case 1: {
- if (v == 0) {
- builder.append('?');
- return builder.toString();
- } else if (128 <= v && v < 192) {
- a |= v & 0x3f;
- builder.append((char) a);
- } else {
- builder.append('?');
- }
- state = 0;
- break;
- }
- case 2: {
- if (v == 0) {
- builder.append('?');
- return builder.toString();
- } else if (128 <= v && v < 192) {
- a |= (v & 0x3f) << 6;
- state = 1;
- } else {
- builder.append('?');
- state = 0;
- }
- break;
- }
- default:
- throw new IllegalStateException("wrong state");
- }
- }
- return builder.toString();
- }
-
- static void putString(final ByteBuffer buffer, final String string) {
- final int len = string.length();
- for (int i = 0; i < len; i ++) {
- char ch = string.charAt(i);
- if (ch > 0 && ch <= 0x7f) {
- buffer.put((byte) ch);
- } else if (ch <= 0x07ff) {
- buffer.put((byte) (0xc0 | 0x1f & ch >> 6));
- buffer.put((byte) (0x80 | 0x3f & ch));
- } else {
- buffer.put((byte) (0xe0 | 0x0f & ch >> 12));
- buffer.put((byte) (0x80 | 0x3f & ch >> 6));
- buffer.put((byte) (0x80 | 0x3f & ch));
- }
- }
- buffer.put((byte) 0);
- }
-
- static QualifiedName getQualifiedName(final ByteBuffer buffer) {
- final int len = buffer.getShort() & 0xffff;
- final String[] segs = new String[len];
- for (int i = 0; i < len; i++) {
- segs[i] = getString(buffer);
- }
- return new QualifiedName(segs);
- }
-
- static void putQualifiedName(final ByteBuffer buffer, final QualifiedName qualifiedName) {
- final int len = qualifiedName.length();
- if (len > 0xffff) {
- throw new IllegalArgumentException("Qualified name is too long");
- }
- buffer.putShort((short) len);
- for (String seg : qualifiedName) {
- putString(buffer, seg);
- }
- }
-
- protected void closeAction() {
- // just to make sure...
- IoUtils.safeClose(channel);
- final IndeterminateOutcomeException ioe = new IndeterminateOutcomeException("The connection was closed");
- // Things running remotely
- for (ReplyHandler x : remoteRequests.getKeys()) {
- SpiUtils.safeHandleException(x, ioe);
- }
- for (RequestHandler x : remoteClients.getKeys()) {
- IoUtils.safeClose(x);
- }
- for (FutureRemoteRequestHandlerSource future : remoteServices.getKeys()) {
- future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
- }
- // Things running locally
- for (RemoteRequestContext localRequest : localRequests.getKeys()) {
- localRequest.cancel();
- }
- for (Handle<RequestHandler> client : forwardedClients.getKeys()) {
- IoUtils.safeClose(client);
- }
- for (Handle<RequestHandlerSource> service : forwardedServices.getKeys()) {
- IoUtils.safeClose(service);
- }
- }
-
- public String toString() {
- return "multiplex connection <" + Integer.toHexString(hashCode()) + "> via " + channel;
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexConnection.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexConnection.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,447 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.xnio.BufferAllocator;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.Buffers;
+import org.jboss.xnio.log.Logger;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.IndeterminateOutcomeException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.List;
+import java.nio.ByteBuffer;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+
+/**
+ *
+ */
+public final class MultiplexConnection extends AbstractAutoCloseable<Connection> implements Connection {
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex");
+
+ //--== Connection configuration items ==--
+ private final MarshallerFactory marshallerFactory;
+ private final MarshallingConfiguration marshallingConfiguration;
+ private final int linkMetric;
+ private final Executor executor;
+ // buffer allocator for outbound message assembly
+ private final BufferAllocator<ByteBuffer> allocator;
+
+ // running on remote node
+ private final IntegerBiMap<ReplyHandler> remoteRequests = IdentityHashIntegerBiMap.createSynchronizing();
+ // running on local node
+ private final IntegerBiMap<RemoteRequestContext> localRequests = IdentityHashIntegerBiMap.createSynchronizing();
+ // sequence for remote requests
+ private final AtomicInteger requestSequence = new AtomicInteger();
+
+ // clients whose requests get forwarded to the remote side
+ // even #s were opened from services forwarded to us (our sequence)
+ // odd #s were forwarded directly to us (remote sequence)
+ private final IntegerBiMap<RequestHandler> remoteClients = IdentityHashIntegerBiMap.createSynchronizing();
+ // forwarded to remote side (handled on this side)
+ private final IntegerResourceBiMap<RequestHandler> forwardedClients = IdentityHashIntegerResourceBiMap.createSynchronizing();
+ // sequence for forwarded clients (shift left one bit, add one, limit is 2^30)
+ private final AtomicInteger forwardedClientSequence = new AtomicInteger();
+ // sequence for clients created from services forwarded to us (shift left one bit, limit is 2^30)
+ private final AtomicInteger remoteClientSequence = new AtomicInteger();
+
+ // services on the remote side
+ private final IntegerBiMap<FutureRemoteRequestHandlerSource> remoteServices = IdentityHashIntegerBiMap.createSynchronizing();
+ // forwarded to remote side (handled on this side)
+ private final IntegerResourceBiMap<RequestHandlerSource> forwardedServices = IdentityHashIntegerResourceBiMap.createSynchronizing();
+ // sequence for remote services
+ private final AtomicInteger remoteServiceSequence = new AtomicInteger();
+
+ // registered services by path
+ private final NamedServiceRegistry namedServiceRegistry;
+
+ private final AllocatedMessageChannel channel;
+
+ public MultiplexConnection(final AllocatedMessageChannel channel, final MultiplexConfiguration configuration) {
+ super(configuration.getExecutor());
+ this.channel = channel;
+ marshallerFactory = configuration.getMarshallerFactory();
+ if (marshallerFactory == null) {
+ throw new NullPointerException("marshallerFactory is null");
+ }
+ marshallingConfiguration = configuration.getMarshallingConfiguration();
+ if (marshallingConfiguration == null) {
+ throw new NullPointerException("marshallingConfiguration is null");
+ }
+ linkMetric = configuration.getLinkMetric();
+ executor = configuration.getExecutor();
+ if (executor == null) {
+ throw new NullPointerException("executor is null");
+ }
+ allocator = configuration.getAllocator();
+ if (allocator == null) {
+ throw new NullPointerException("allocator is null");
+ }
+ namedServiceRegistry = configuration.getNamedServiceRegistry();
+ if (namedServiceRegistry == null) {
+ throw new NullPointerException("namedServiceRegistry is null");
+ }
+ }
+
+ // sequence methods
+
+ int nextRequest() {
+ return requestSequence.getAndIncrement() & 0x7fffffff;
+ }
+
+ int nextForwardedClient() {
+ return (forwardedClientSequence.getAndIncrement() << 1 | 1) & 0x7fffffff;
+ }
+
+ int nextRemoteClient() {
+ return remoteClientSequence.getAndIncrement() << 1 & 0x7fffffff;
+ }
+
+ int nextRemoteService() {
+ return remoteServiceSequence.getAndIncrement() & 0x7fffffff;
+ }
+
+ void doBlockingWrite(ByteBuffer... buffers) throws IOException {
+ log.trace("Sending message:\n%s", new MultiDumper(buffers));
+ if (buffers.length == 1) doBlockingWrite(buffers[0]); else for (;;) {
+ if (channel.send(buffers)) {
+ return;
+ }
+ channel.awaitWritable();
+ }
+ }
+
+ private static final class MultiDumper {
+ private final ByteBuffer[] buffers;
+
+ public MultiDumper(final ByteBuffer[] buffers) {
+ this.buffers = buffers;
+ }
+
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < buffers.length; i++) {
+ ByteBuffer buffer = buffers[i];
+ builder.append("Buffer ");
+ builder.append(i);
+ builder.append(":\n");
+ try {
+ Buffers.dump(buffer, builder, 8, 1);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ return builder.toString();
+ }
+ }
+
+ void doBlockingWrite(ByteBuffer buffer) throws IOException {
+ log.trace("Sending message:\n%s", Buffers.createDumper(buffer, 8, 1));
+ for (;;) {
+ if (channel.send(buffer)) {
+ return;
+ }
+ channel.awaitWritable();
+ }
+ }
+
+ protected Executor getExecutor() {
+ return executor;
+ }
+
+ void doBlockingWrite(List<ByteBuffer> buffers) throws IOException {
+ doBlockingWrite(buffers.toArray(new ByteBuffer[buffers.size()]));
+ }
+
+ MarshallerFactory getMarshallerFactory() {
+ return marshallerFactory;
+ }
+
+ MarshallingConfiguration getMarshallingConfiguration() {
+ return marshallingConfiguration;
+ }
+
+ int getLinkMetric() {
+ return linkMetric;
+ }
+
+ BufferAllocator<ByteBuffer> getAllocator() {
+ return allocator;
+ }
+
+ AllocatedMessageChannel getChannel() {
+ return channel;
+ }
+
+ void removeRemoteClient(final int identifier) {
+ remoteClients.remove(identifier);
+ }
+
+ void addRemoteRequest(final int id, final ReplyHandler handler) {
+ remoteRequests.put(id, handler);
+ }
+
+ void addRemoteClient(final int id, final RequestHandler handler) {
+ remoteClients.put(id, handler);
+ }
+
+ Handle<RequestHandler> getForwardedClient(final int id) {
+ return forwardedClients.get(id);
+ }
+
+ ReplyHandler removeRemoteRequest(final int id) {
+ return remoteRequests.remove(id);
+ }
+
+ RemoteRequestContext getLocalRequest(final int id) {
+ return localRequests.get(id);
+ }
+
+ ReplyHandler getRemoteRequest(final int id) {
+ return remoteRequests.get(id);
+ }
+
+ Handle<RequestHandler> removeForwardedClient(final int id) {
+ return forwardedClients.remove(id);
+ }
+
+ Handle<RequestHandlerSource> getForwardedService(final int id) {
+ return forwardedServices.get(id);
+ }
+
+ void addForwardedClient(final int id, final Handle<RequestHandler> handle) {
+ forwardedClients.put(id, handle);
+ }
+
+ void addForwadedService(final int id, final Handle<RequestHandlerSource> service) {
+ forwardedServices.put(id, service);
+ }
+
+ Handle<RequestHandlerSource> removeForwardedService(final int id) {
+ return forwardedServices.remove(id);
+ }
+
+ Handle<RequestHandlerSource> getServiceByPath(String path) {
+ return getService(QualifiedName.parse(path));
+ }
+
+ Handle<RequestHandlerSource> getService(final QualifiedName name) {
+ return namedServiceRegistry.lookupService(name);
+ }
+
+ FutureRemoteRequestHandlerSource getFutureRemoteService(final int id) {
+ return remoteServices.get(id);
+ }
+
+ FutureRemoteRequestHandlerSource removeFutureRemoteService(final int id) {
+ return remoteServices.remove(id);
+ }
+
+ public Handle<RequestHandlerSource> openRemoteService(final QualifiedName name) throws IOException {
+ log.trace("Sending request to open remote service \"%s\"", name);
+ final FutureRemoteRequestHandlerSource future = new FutureRemoteRequestHandlerSource();
+ int id;
+ for (;;) {
+ id = nextRemoteService();
+ if (remoteServices.putIfAbsent(id, future)) {
+ break;
+ }
+ }
+ ByteBuffer buffer = ByteBuffer.allocate(5 + getByteLength(name));
+ buffer.put((byte) MessageType.SERVICE_OPEN_REQUEST.getId());
+ buffer.putInt(id);
+ putQualifiedName(buffer, name);
+ buffer.flip();
+ doBlockingWrite(buffer);
+ try {
+ final Handle<RequestHandlerSource> handle = future.getInterruptibly().getHandle();
+ log.trace("Opened %s", handle);
+ return handle;
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new InterruptedIOException("Interrupted while waiting for remote service");
+ }
+ }
+
+ static int getByteLength(QualifiedName name) {
+ int cnt = 2; // short header
+ for (String s : name) {
+ cnt += getByteLength(s);
+ }
+ return cnt;
+ }
+
+ static int getByteLength(String s) {
+ final int len = s.length();
+ int cnt = 0;
+ for (int i = 0; i < len; i++) {
+ char ch = s.charAt(i);
+ if (ch > 0 && ch <= 0x7f) {
+ cnt ++;
+ } else if (ch <= 0x07ff) {
+ cnt += 2;
+ } else {
+ cnt += 3;
+ }
+ }
+ // null terminator...
+ cnt ++;
+ return cnt;
+ }
+
+ static String getString(final ByteBuffer buffer) {
+ StringBuilder builder = new StringBuilder();
+ int state = 0, a = 0;
+ while (buffer.hasRemaining()) {
+ final int v = buffer.get() & 0xff;
+ switch (state) {
+ case 0: {
+ if (v == 0) {
+ return builder.toString();
+ } else if (v < 128) {
+ builder.append((char) v);
+ } else if (192 <= v && v < 224) {
+ a = v << 6;
+ state = 1;
+ } else if (224 <= v && v < 232) {
+ a = v << 12;
+ state = 2;
+ } else {
+ builder.append('?');
+ }
+ break;
+ }
+ case 1: {
+ if (v == 0) {
+ builder.append('?');
+ return builder.toString();
+ } else if (128 <= v && v < 192) {
+ a |= v & 0x3f;
+ builder.append((char) a);
+ } else {
+ builder.append('?');
+ }
+ state = 0;
+ break;
+ }
+ case 2: {
+ if (v == 0) {
+ builder.append('?');
+ return builder.toString();
+ } else if (128 <= v && v < 192) {
+ a |= (v & 0x3f) << 6;
+ state = 1;
+ } else {
+ builder.append('?');
+ state = 0;
+ }
+ break;
+ }
+ default:
+ throw new IllegalStateException("wrong state");
+ }
+ }
+ return builder.toString();
+ }
+
+ static void putString(final ByteBuffer buffer, final String string) {
+ final int len = string.length();
+ for (int i = 0; i < len; i ++) {
+ char ch = string.charAt(i);
+ if (ch > 0 && ch <= 0x7f) {
+ buffer.put((byte) ch);
+ } else if (ch <= 0x07ff) {
+ buffer.put((byte) (0xc0 | 0x1f & ch >> 6));
+ buffer.put((byte) (0x80 | 0x3f & ch));
+ } else {
+ buffer.put((byte) (0xe0 | 0x0f & ch >> 12));
+ buffer.put((byte) (0x80 | 0x3f & ch >> 6));
+ buffer.put((byte) (0x80 | 0x3f & ch));
+ }
+ }
+ buffer.put((byte) 0);
+ }
+
+ static QualifiedName getQualifiedName(final ByteBuffer buffer) {
+ final int len = buffer.getShort() & 0xffff;
+ final String[] segs = new String[len];
+ for (int i = 0; i < len; i++) {
+ segs[i] = getString(buffer);
+ }
+ return new QualifiedName(segs);
+ }
+
+ static void putQualifiedName(final ByteBuffer buffer, final QualifiedName qualifiedName) {
+ final int len = qualifiedName.length();
+ if (len > 0xffff) {
+ throw new IllegalArgumentException("Qualified name is too long");
+ }
+ buffer.putShort((short) len);
+ for (String seg : qualifiedName) {
+ putString(buffer, seg);
+ }
+ }
+
+ protected void closeAction() {
+ // just to make sure...
+ IoUtils.safeClose(channel);
+ final IndeterminateOutcomeException ioe = new IndeterminateOutcomeException("The connection was closed");
+ // Things running remotely
+ for (ReplyHandler x : remoteRequests.getKeys()) {
+ SpiUtils.safeHandleException(x, ioe);
+ }
+ for (RequestHandler x : remoteClients.getKeys()) {
+ IoUtils.safeClose(x);
+ }
+ for (FutureRemoteRequestHandlerSource future : remoteServices.getKeys()) {
+ future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
+ }
+ // Things running locally
+ for (RemoteRequestContext localRequest : localRequests.getKeys()) {
+ localRequest.cancel();
+ }
+ for (Handle<RequestHandler> client : forwardedClients.getKeys()) {
+ IoUtils.safeClose(client);
+ }
+ for (Handle<RequestHandlerSource> service : forwardedServices.getKeys()) {
+ IoUtils.safeClose(service);
+ }
+ }
+
+ public String toString() {
+ return "multiplex connection <" + Integer.toHexString(hashCode()) + "> via " + channel;
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexProtocol.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.Endpoint;
-import org.jboss.xnio.IoHandlerFactory;
-import org.jboss.xnio.ChannelSource;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.AbstractConvertingIoFuture;
-import org.jboss.xnio.IoHandler;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import java.io.IOException;
-
-/**
- *
- */
-public final class MultiplexProtocol {
-
- private MultiplexProtocol() {
- }
-
- /**
- * Create a request server for the multiplex protocol.
- *
- * @param endpoint the endpoint
- * @param configuration the configuration
- * @return a handler factory for passing to an XNIO server
- */
- public static IoHandlerFactory<AllocatedMessageChannel> createServer(final Endpoint endpoint, final MultiplexConfiguration configuration) {
- return new IoHandlerFactory<AllocatedMessageChannel>() {
- public IoHandler<? super AllocatedMessageChannel> createHandler() {
- return new SimpleMultiplexHandler(endpoint, configuration);
- }
- };
- }
-
- /**
- * Create a request client for the multiplex protocol.
- *
- * @param endpoint the endpoint
- * @param configuration the configuration
- * @param channelSource the XNIO channel source to use to establish the connection
- * @return a handle which may be used to close the connection
- * @throws IOException if an error occurs
- */
- public static IoFuture<MultiplexConnection> connect(final Endpoint endpoint, final MultiplexConfiguration configuration, final ChannelSource<AllocatedMessageChannel> channelSource) throws IOException {
- final SimpleMultiplexHandler handler = new SimpleMultiplexHandler(endpoint, configuration);
- final IoFuture<AllocatedMessageChannel> futureChannel = channelSource.open(handler);
- return new AbstractConvertingIoFuture<MultiplexConnection, AllocatedMessageChannel>(futureChannel) {
- protected MultiplexConnection convert(final AllocatedMessageChannel channel) throws IOException {
- return handler.getConnection().get();
- }
- };
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexProtocol.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexProtocol.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.xnio.IoHandlerFactory;
+import org.jboss.xnio.ChannelSource;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.AbstractConvertingIoFuture;
+import org.jboss.xnio.IoHandler;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+import java.io.IOException;
+
+/**
+ *
+ */
+public final class MultiplexProtocol {
+
+ private MultiplexProtocol() {
+ }
+
+ /**
+ * Create a request server for the multiplex protocol.
+ *
+ * @param configuration the configuration
+ * @return a handler factory for passing to an XNIO server
+ */
+ public static IoHandlerFactory<AllocatedMessageChannel> createServer(final MultiplexConfiguration configuration) {
+ return new IoHandlerFactory<AllocatedMessageChannel>() {
+ public IoHandler<? super AllocatedMessageChannel> createHandler() {
+ return new SimpleMultiplexHandler(configuration);
+ }
+ };
+ }
+
+ /**
+ * Create a request client for the multiplex protocol.
+ *
+ * @param configuration the configuration
+ * @param channelSource the XNIO channel source to use to establish the connection
+ * @return a handle which may be used to close the connection
+ * @throws IOException if an error occurs
+ */
+ public static IoFuture<MultiplexConnection> connect(final MultiplexConfiguration configuration, final ChannelSource<AllocatedMessageChannel> channelSource) throws IOException {
+ final SimpleMultiplexHandler handler = new SimpleMultiplexHandler(configuration);
+ final IoFuture<AllocatedMessageChannel> futureChannel = channelSource.open(handler);
+ return new AbstractConvertingIoFuture<MultiplexConnection, AllocatedMessageChannel>(futureChannel) {
+ protected MultiplexConnection convert(final AllocatedMessageChannel channel) throws IOException {
+ return handler.getConnection().get();
+ }
+ };
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,391 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.xnio.IoReadHandler;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.Buffers;
-import org.jboss.xnio.log.Logger;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.ReplyException;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.ServiceRegistrationException;
-import org.jboss.remoting.QualifiedName;
-import org.jboss.marshalling.Unmarshaller;
-import org.jboss.marshalling.Marshalling;
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.MarshallerFactory;
-import org.jboss.marshalling.MarshallingConfiguration;
-import java.nio.ByteBuffer;
-import java.nio.BufferUnderflowException;
-import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- *
- */
-public final class MultiplexReadHandler implements IoReadHandler<AllocatedMessageChannel> {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex");
- private static final StackTraceElement[] emptyStackTraceElements = new StackTraceElement[0];
- private final MultiplexConnection connection;
-
- public MultiplexReadHandler(final MultiplexConnection connection) {
- this.connection = connection;
- }
-
- public void handleReadable(final AllocatedMessageChannel channel) {
- final MultiplexConnection connection = this.connection;
- final MarshallerFactory marshallerFactory = connection.getMarshallerFactory();
- final MarshallingConfiguration marshallingConfiguration = connection.getMarshallingConfiguration();
- for (;;) try {
- final ByteBuffer buffer;
- try {
- buffer = channel.receive();
- } catch (IOException e) {
- log.error(e, "I/O error in protocol channel; closing channel");
- IoUtils.safeClose(channel);
- return;
- }
- if (buffer == null) {
- IoUtils.safeClose(channel);
- return;
- }
- if (! buffer.hasRemaining()) {
- // would block
- channel.resumeReads();
- return;
- }
- log.trace("Received raw message:\n%s", Buffers.createDumper(buffer, 8, 1));
- final MessageType msgType;
- try {
- msgType = MessageType.getMessageType(buffer.get() & 0xff);
- } catch (IllegalArgumentException ex) {
- log.trace("Received invalid message type");
- return;
- }
- switch (msgType) {
- case REQUEST: {
- final int clientId = buffer.getInt();
- final Handle<RequestHandler> handle = connection.getForwardedClient(clientId);
- if (handle == null) {
- log.trace("Request on invalid client ID %d", Integer.valueOf(clientId));
- break;
- }
- final int requestId = buffer.getInt();
- final Object payload;
- try {
- final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
- try {
- unmarshaller.start(Marshalling.createByteInput(buffer));
- payload = unmarshaller.readObject();
- unmarshaller.finish();
- log.trace("Received inbound request (client id = %d, request id = %d) (type is %s)", Integer.valueOf(clientId), Integer.valueOf(requestId), payload == null ? "null" : payload.getClass());
- } finally {
- IoUtils.safeClose(unmarshaller);
- }
- } catch (Exception ex) {
- // IOException | ClassNotFoundException
- log.trace("Failed to unmarshal a request (%s), sending %s", ex, MessageType.REQUEST_RECEIVE_FAILED);
- try {
- final Marshaller marshaller = marshallerFactory.createMarshaller(marshallingConfiguration);
- try {
- List<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
- marshaller.start(new BufferByteOutput(connection.getAllocator(), buffers));
- marshaller.write(MessageType.REQUEST_RECEIVE_FAILED.getId());
- ex.setStackTrace(emptyStackTraceElements);
- final IOException ioe = new IOException("Request receive failed");
- ioe.initCause(ex);
- ioe.setStackTrace(emptyStackTraceElements);
- marshaller.writeObject(ioe);
- marshaller.finish();
- connection.doBlockingWrite(buffers);
- } finally {
- IoUtils.safeClose(marshaller);
- }
- } catch (IOException ioe) {
- log.warn("Failed to send notification of failure to unmarshal a request: %s", ioe);
- }
- break;
- }
- // request received OK
- final RequestHandler requestHandler = handle.getResource();
- requestHandler.receiveRequest(payload, new MultiplexReplyHandler(requestId, connection));
- break;
- }
- case REPLY: {
- final int requestId = buffer.getInt();
- final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
- if (replyHandler == null) {
- log.trace("Got reply to unknown request %d", Integer.valueOf(requestId));
- break;
- }
- final Object payload;
- try {
- final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
- try {
- unmarshaller.start(Marshalling.createByteInput(buffer));
- payload = unmarshaller.readObject();
- unmarshaller.finish();
- log.trace("Received inbound reply (id = %d) (type is %s)", Integer.valueOf(requestId), payload == null ? "null" : payload.getClass());
- } finally {
- IoUtils.safeClose(unmarshaller);
- }
- } catch (Exception ex) {
- // IOException | ClassNotFoundException
- log.trace("Failed to unmarshal a reply (%s), sending a ReplyException", ex);
- SpiUtils.safeHandleException(replyHandler, new ReplyException("Unmarshal failed", ex));
- break;
- }
- SpiUtils.safeHandleReply(replyHandler, payload);
- break;
- }
- case CANCEL_REQUEST: {
- final int requestId = buffer.getInt();
- final RemoteRequestContext context = connection.getLocalRequest(requestId);
- if (context != null) {
- log.trace("Received inbound cancel request (request id = %d) to %s", Integer.valueOf(requestId), context);
- context.cancel();
- }
- break;
- }
- case CANCEL_ACK: {
- final int requestId = buffer.getInt();
- final ReplyHandler replyHandler = connection.getRemoteRequest(requestId);
- if (replyHandler != null) {
- log.trace("Received inbound cancel acknowledge (request id = %d) to ", Integer.valueOf(requestId), replyHandler);
- SpiUtils.safeHandleCancellation(replyHandler);
- }
- break;
- }
- case REQUEST_RECEIVE_FAILED: {
- final int requestId = buffer.getInt();
- final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
- if (replyHandler == null) {
- log.trace("Got a failure reply to unknown request %d to %s", Integer.valueOf(requestId), replyHandler);
- break;
- }
- final IOException cause;
- try {
- final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
- try {
- unmarshaller.start(Marshalling.createByteInput(buffer));
- cause = (IOException) unmarshaller.readObject();
- unmarshaller.finish();
- log.trace("Received inbound request receive failure notification to %s: %s", replyHandler, cause);
- } finally {
- IoUtils.safeClose(unmarshaller);
- }
- } catch (IOException e) {
- log.trace("Received inbound request receive failure notification; the remote exception could not be read: %s", e);
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote operation failed; the remote exception could not be read", e));
- break;
- } catch (ClassNotFoundException e) {
- log.trace("Received inbound request receive failure notification; the remote exception could not be read: %s", e);
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote operation failed; the remote exception could not be read", e));
- break;
- }
- SpiUtils.safeHandleException(replyHandler, cause);
- break;
- }
- case REQUEST_FAILED: {
- final int requestId = buffer.getInt();
- final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
- if (replyHandler == null) {
- log.trace("Got reply to unknown request %d", Integer.valueOf(requestId));
- break;
- }
- final IOException cause;
- try {
- final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
- try {
- unmarshaller.start(Marshalling.createByteInput(buffer));
- try {
- cause = (IOException) unmarshaller.readObject();
- log.trace("Received inbound request failure notification: %s", cause);
- } catch (ClassNotFoundException e) {
- log.trace("Received inbound request failure notification; the remote exception could not be read: %s", e);
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an ClassNotFoundException occurred when attempting to unmarshal the cause)"));
- log.trace(e, "Class not found in exception reply to request ID %d", Integer.valueOf(requestId));
- break;
- } catch (ClassCastException e) {
- log.trace("Received inbound request failure notification; the remote exception could not be read: %s", e);
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an ClassCastException occurred when attempting to unmarshal the cause)"));
- log.trace(e, "Class cast exception in exception reply to request ID %d", Integer.valueOf(requestId));
- break;
- }
- } finally {
- IoUtils.safeClose(unmarshaller);
- }
- } catch (IOException ex) {
- log.trace("Received inbound request failure notification; the remote exception could not be read: %s", ex);
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an unexpected I/O error occurred when attempting to read the cause)"));
- break;
- }
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote execution failed", cause));
- break;
- }
- case CLIENT_CLOSE: {
- final int clientId = buffer.getInt();
- final Handle<RequestHandler> handle = connection.removeForwardedClient(clientId);
- if (handle == null) {
- log.warn("Got client close message for unknown client %d", Integer.valueOf(clientId));
- break;
- }
- log.trace("Received inbound client close for %s", handle);
- IoUtils.safeClose(handle);
- break;
- }
- case CLIENT_OPEN: {
- final int serviceId = buffer.getInt();
- final int clientId = buffer.getInt();
- final Handle<RequestHandlerSource> handle = connection.getForwardedService(serviceId);
- if (handle == null) {
- log.warn("Received client open message for unknown service %d", Integer.valueOf(serviceId));
- break;
- }
- try {
- final RequestHandlerSource requestHandlerSource = handle.getResource();
- final Handle<RequestHandler> clientHandle = requestHandlerSource.createRequestHandler();
- log.trace("Opening client %d from service %d", Integer.valueOf(clientId), Integer.valueOf(serviceId));
- connection.addForwardedClient(clientId, clientHandle);
- } catch (IOException ex) {
- log.error(ex, "Failed to create a request handler for client ID %d", Integer.valueOf(clientId));
- break;
- } finally {
- IoUtils.safeClose(handle);
- }
- break;
- }
- case SERVICE_OPEN_REQUEST: {
- final int serviceId = buffer.getInt();
- final QualifiedName qualifiedName = MultiplexConnection.getQualifiedName(buffer);
- log.trace("Received a service open request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
- final Handle<RequestHandlerSource> service = connection.getService(qualifiedName);
- if (service == null) {
- ByteBuffer replyBuffer = ByteBuffer.allocate(5);
- replyBuffer.put((byte) MessageType.SERVICE_OPEN_NOT_FOUND.getId());
- replyBuffer.putInt(serviceId);
- replyBuffer.flip();
- try {
- log.trace("Sending a service-open-not-found message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
- connection.doBlockingWrite(replyBuffer);
- } catch (IOException e) {
- log.error(e, "Failed to send an error reply to an invalid service open request");
- }
- break;
- }
- final Handle<RequestHandlerSource> ourHandle;
- try {
- ourHandle = service.getResource().getHandle();
- } catch (IOException e) {
- log.error("Failed to acquire a handle to registered service: %s", e);
- ByteBuffer replyBuffer = ByteBuffer.allocate(5);
- replyBuffer.put((byte) MessageType.SERVICE_OPEN_FAILED.getId());
- replyBuffer.putInt(serviceId);
- replyBuffer.flip();
- try {
- log.trace("Sending a service-open-failed message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
- connection.doBlockingWrite(replyBuffer);
- } catch (IOException e2) {
- log.trace(e, "Failed to send an exception reply to a service open request");
- }
- break;
- }
- connection.addForwadedService(serviceId, ourHandle);
- ByteBuffer replyBuffer = ByteBuffer.allocate(5);
- replyBuffer.put((byte) MessageType.SERVICE_OPEN_REPLY.getId());
- replyBuffer.putInt(serviceId);
- replyBuffer.flip();
- try {
- log.trace("Sending a service open reply message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
- connection.doBlockingWrite(replyBuffer);
- } catch (IOException e) {
- log.trace(e, "Failed to send a reply to a service open request");
- }
- break;
- }
- case SERVICE_OPEN_FAILED:
- case SERVICE_OPEN_NOT_FOUND:
- case SERVICE_OPEN_FORBIDDEN: {
- final int serviceId = buffer.getInt();
- log.trace("Received a service open failure (%s) message for service %d", msgType, Integer.valueOf(serviceId));
- final FutureRemoteRequestHandlerSource future = connection.removeFutureRemoteService(serviceId);
- if (future == null) {
- log.trace("Service open failure reply received for unknown service ID %d", Integer.valueOf(serviceId));
- break;
- }
- future.setException(
- msgType == MessageType.SERVICE_OPEN_NOT_FOUND ? new ServiceRegistrationException("Service not found") :
- msgType == MessageType.SERVICE_OPEN_FORBIDDEN ? new ServiceRegistrationException("Service open forbidden") :
- new ServiceRegistrationException("Service open failed")
- );
- break;
- }
- case SERVICE_OPEN_REPLY: {
- final int serviceId = buffer.getInt();
- final FutureRemoteRequestHandlerSource future = connection.getFutureRemoteService(serviceId);
- if (future == null) {
- log.trace("Service open reply received for unknown service ID %d", Integer.valueOf(serviceId));
- break;
- }
- log.trace("Received a service open reply message for service %d for %s", Integer.valueOf(serviceId), future);
- final MultiplexRequestHandlerSource requestHandlerSource = new MultiplexRequestHandlerSource(serviceId, connection);
- future.setResult(requestHandlerSource);
- break;
- }
- case SERVICE_CLOSE_NOTIFY: {
- final int serviceId = buffer.getInt();
- final FutureRemoteRequestHandlerSource future = connection.removeFutureRemoteService(serviceId);
- log.trace("Received a service close notify message for service %d for %s", Integer.valueOf(serviceId), future);
- future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
- break;
- }
- case SERVICE_CLOSE_REQUEST: {
- final int serviceId = buffer.getInt();
- final Handle<RequestHandlerSource> handle = connection.removeForwardedService(serviceId);
- if (handle == null) {
- log.trace("Received service close request on unknown ID %d", Integer.valueOf(serviceId));
- break;
- }
- IoUtils.safeClose(handle);
- break;
- }
- default: {
- log.error("Malformed packet received (invalid message type %s)", msgType);
- }
- case CONNECTION_CLOSE:
- break;
- }
- } catch (BufferUnderflowException e) {
- log.error(e, "Malformed packet received (buffer underflow)");
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReadHandler.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReadHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,391 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.xnio.IoReadHandler;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.Buffers;
+import org.jboss.xnio.log.Logger;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.ReplyException;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.ServiceRegistrationException;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.marshalling.Unmarshaller;
+import org.jboss.marshalling.Marshalling;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import java.nio.ByteBuffer;
+import java.nio.BufferUnderflowException;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ *
+ */
+public final class MultiplexReadHandler implements IoReadHandler<AllocatedMessageChannel> {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex");
+ private static final StackTraceElement[] emptyStackTraceElements = new StackTraceElement[0];
+ private final MultiplexConnection connection;
+
+ public MultiplexReadHandler(final MultiplexConnection connection) {
+ this.connection = connection;
+ }
+
+ public void handleReadable(final AllocatedMessageChannel channel) {
+ final MultiplexConnection connection = this.connection;
+ final MarshallerFactory marshallerFactory = connection.getMarshallerFactory();
+ final MarshallingConfiguration marshallingConfiguration = connection.getMarshallingConfiguration();
+ for (;;) try {
+ final ByteBuffer buffer;
+ try {
+ buffer = channel.receive();
+ } catch (IOException e) {
+ log.error(e, "I/O error in protocol channel; closing channel");
+ IoUtils.safeClose(channel);
+ return;
+ }
+ if (buffer == null) {
+ IoUtils.safeClose(channel);
+ return;
+ }
+ if (! buffer.hasRemaining()) {
+ // would block
+ channel.resumeReads();
+ return;
+ }
+ log.trace("Received raw message:\n%s", Buffers.createDumper(buffer, 8, 1));
+ final MessageType msgType;
+ try {
+ msgType = MessageType.getMessageType(buffer.get() & 0xff);
+ } catch (IllegalArgumentException ex) {
+ log.trace("Received invalid message type");
+ return;
+ }
+ switch (msgType) {
+ case REQUEST: {
+ final int clientId = buffer.getInt();
+ final Handle<RequestHandler> handle = connection.getForwardedClient(clientId);
+ if (handle == null) {
+ log.trace("Request on invalid client ID %d", Integer.valueOf(clientId));
+ break;
+ }
+ final int requestId = buffer.getInt();
+ final Object payload;
+ try {
+ final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
+ try {
+ unmarshaller.start(Marshalling.createByteInput(buffer));
+ payload = unmarshaller.readObject();
+ unmarshaller.finish();
+ log.trace("Received inbound request (client id = %d, request id = %d) (type is %s)", Integer.valueOf(clientId), Integer.valueOf(requestId), payload == null ? "null" : payload.getClass());
+ } finally {
+ IoUtils.safeClose(unmarshaller);
+ }
+ } catch (Exception ex) {
+ // IOException | ClassNotFoundException
+ log.trace("Failed to unmarshal a request (%s), sending %s", ex, MessageType.REQUEST_RECEIVE_FAILED);
+ try {
+ final Marshaller marshaller = marshallerFactory.createMarshaller(marshallingConfiguration);
+ try {
+ List<ByteBuffer> buffers = new ArrayList<ByteBuffer>();
+ marshaller.start(new BufferByteOutput(connection.getAllocator(), buffers));
+ marshaller.write(MessageType.REQUEST_RECEIVE_FAILED.getId());
+ ex.setStackTrace(emptyStackTraceElements);
+ final IOException ioe = new IOException("Request receive failed");
+ ioe.initCause(ex);
+ ioe.setStackTrace(emptyStackTraceElements);
+ marshaller.writeObject(ioe);
+ marshaller.finish();
+ connection.doBlockingWrite(buffers);
+ } finally {
+ IoUtils.safeClose(marshaller);
+ }
+ } catch (IOException ioe) {
+ log.warn("Failed to send notification of failure to unmarshal a request: %s", ioe);
+ }
+ break;
+ }
+ // request received OK
+ final RequestHandler requestHandler = handle.getResource();
+ requestHandler.receiveRequest(payload, new MultiplexReplyHandler(requestId, connection));
+ break;
+ }
+ case REPLY: {
+ final int requestId = buffer.getInt();
+ final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
+ if (replyHandler == null) {
+ log.trace("Got reply to unknown request %d", Integer.valueOf(requestId));
+ break;
+ }
+ final Object payload;
+ try {
+ final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
+ try {
+ unmarshaller.start(Marshalling.createByteInput(buffer));
+ payload = unmarshaller.readObject();
+ unmarshaller.finish();
+ log.trace("Received inbound reply (id = %d) (type is %s)", Integer.valueOf(requestId), payload == null ? "null" : payload.getClass());
+ } finally {
+ IoUtils.safeClose(unmarshaller);
+ }
+ } catch (Exception ex) {
+ // IOException | ClassNotFoundException
+ log.trace("Failed to unmarshal a reply (%s), sending a ReplyException", ex);
+ SpiUtils.safeHandleException(replyHandler, new ReplyException("Unmarshal failed", ex));
+ break;
+ }
+ SpiUtils.safeHandleReply(replyHandler, payload);
+ break;
+ }
+ case CANCEL_REQUEST: {
+ final int requestId = buffer.getInt();
+ final RemoteRequestContext context = connection.getLocalRequest(requestId);
+ if (context != null) {
+ log.trace("Received inbound cancel request (request id = %d) to %s", Integer.valueOf(requestId), context);
+ context.cancel();
+ }
+ break;
+ }
+ case CANCEL_ACK: {
+ final int requestId = buffer.getInt();
+ final ReplyHandler replyHandler = connection.getRemoteRequest(requestId);
+ if (replyHandler != null) {
+ log.trace("Received inbound cancel acknowledge (request id = %d) to ", Integer.valueOf(requestId), replyHandler);
+ SpiUtils.safeHandleCancellation(replyHandler);
+ }
+ break;
+ }
+ case REQUEST_RECEIVE_FAILED: {
+ final int requestId = buffer.getInt();
+ final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
+ if (replyHandler == null) {
+ log.trace("Got a failure reply to unknown request %d to %s", Integer.valueOf(requestId), replyHandler);
+ break;
+ }
+ final IOException cause;
+ try {
+ final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
+ try {
+ unmarshaller.start(Marshalling.createByteInput(buffer));
+ cause = (IOException) unmarshaller.readObject();
+ unmarshaller.finish();
+ log.trace("Received inbound request receive failure notification to %s: %s", replyHandler, cause);
+ } finally {
+ IoUtils.safeClose(unmarshaller);
+ }
+ } catch (IOException e) {
+ log.trace("Received inbound request receive failure notification; the remote exception could not be read: %s", e);
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote operation failed; the remote exception could not be read", e));
+ break;
+ } catch (ClassNotFoundException e) {
+ log.trace("Received inbound request receive failure notification; the remote exception could not be read: %s", e);
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote operation failed; the remote exception could not be read", e));
+ break;
+ }
+ SpiUtils.safeHandleException(replyHandler, cause);
+ break;
+ }
+ case REQUEST_FAILED: {
+ final int requestId = buffer.getInt();
+ final ReplyHandler replyHandler = connection.removeRemoteRequest(requestId);
+ if (replyHandler == null) {
+ log.trace("Got reply to unknown request %d", Integer.valueOf(requestId));
+ break;
+ }
+ final IOException cause;
+ try {
+ final Unmarshaller unmarshaller = marshallerFactory.createUnmarshaller(marshallingConfiguration);
+ try {
+ unmarshaller.start(Marshalling.createByteInput(buffer));
+ try {
+ cause = (IOException) unmarshaller.readObject();
+ log.trace("Received inbound request failure notification: %s", cause);
+ } catch (ClassNotFoundException e) {
+ log.trace("Received inbound request failure notification; the remote exception could not be read: %s", e);
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an ClassNotFoundException occurred when attempting to unmarshal the cause)"));
+ log.trace(e, "Class not found in exception reply to request ID %d", Integer.valueOf(requestId));
+ break;
+ } catch (ClassCastException e) {
+ log.trace("Received inbound request failure notification; the remote exception could not be read: %s", e);
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an ClassCastException occurred when attempting to unmarshal the cause)"));
+ log.trace(e, "Class cast exception in exception reply to request ID %d", Integer.valueOf(requestId));
+ break;
+ }
+ } finally {
+ IoUtils.safeClose(unmarshaller);
+ }
+ } catch (IOException ex) {
+ log.trace("Received inbound request failure notification; the remote exception could not be read: %s", ex);
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote request failed (and an unexpected I/O error occurred when attempting to read the cause)"));
+ break;
+ }
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Remote execution failed", cause));
+ break;
+ }
+ case CLIENT_CLOSE: {
+ final int clientId = buffer.getInt();
+ final Handle<RequestHandler> handle = connection.removeForwardedClient(clientId);
+ if (handle == null) {
+ log.warn("Got client close message for unknown client %d", Integer.valueOf(clientId));
+ break;
+ }
+ log.trace("Received inbound client close for %s", handle);
+ IoUtils.safeClose(handle);
+ break;
+ }
+ case CLIENT_OPEN: {
+ final int serviceId = buffer.getInt();
+ final int clientId = buffer.getInt();
+ final Handle<RequestHandlerSource> handle = connection.getForwardedService(serviceId);
+ if (handle == null) {
+ log.warn("Received client open message for unknown service %d", Integer.valueOf(serviceId));
+ break;
+ }
+ try {
+ final RequestHandlerSource requestHandlerSource = handle.getResource();
+ final Handle<RequestHandler> clientHandle = requestHandlerSource.createRequestHandler();
+ log.trace("Opening client %d from service %d", Integer.valueOf(clientId), Integer.valueOf(serviceId));
+ connection.addForwardedClient(clientId, clientHandle);
+ } catch (IOException ex) {
+ log.error(ex, "Failed to create a request handler for client ID %d", Integer.valueOf(clientId));
+ break;
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ break;
+ }
+ case SERVICE_OPEN_REQUEST: {
+ final int serviceId = buffer.getInt();
+ final QualifiedName qualifiedName = MultiplexConnection.getQualifiedName(buffer);
+ log.trace("Received a service open request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
+ final Handle<RequestHandlerSource> service = connection.getService(qualifiedName);
+ if (service == null) {
+ ByteBuffer replyBuffer = ByteBuffer.allocate(5);
+ replyBuffer.put((byte) MessageType.SERVICE_OPEN_NOT_FOUND.getId());
+ replyBuffer.putInt(serviceId);
+ replyBuffer.flip();
+ try {
+ log.trace("Sending a service-open-not-found message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
+ connection.doBlockingWrite(replyBuffer);
+ } catch (IOException e) {
+ log.error(e, "Failed to send an error reply to an invalid service open request");
+ }
+ break;
+ }
+ final Handle<RequestHandlerSource> ourHandle;
+ try {
+ ourHandle = service.getResource().getHandle();
+ } catch (IOException e) {
+ log.error("Failed to acquire a handle to registered service: %s", e);
+ ByteBuffer replyBuffer = ByteBuffer.allocate(5);
+ replyBuffer.put((byte) MessageType.SERVICE_OPEN_FAILED.getId());
+ replyBuffer.putInt(serviceId);
+ replyBuffer.flip();
+ try {
+ log.trace("Sending a service-open-failed message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
+ connection.doBlockingWrite(replyBuffer);
+ } catch (IOException e2) {
+ log.trace(e, "Failed to send an exception reply to a service open request");
+ }
+ break;
+ }
+ connection.addForwadedService(serviceId, ourHandle);
+ ByteBuffer replyBuffer = ByteBuffer.allocate(5);
+ replyBuffer.put((byte) MessageType.SERVICE_OPEN_REPLY.getId());
+ replyBuffer.putInt(serviceId);
+ replyBuffer.flip();
+ try {
+ log.trace("Sending a service open reply message for request for service %d on path \"%s\"", Integer.valueOf(serviceId), qualifiedName);
+ connection.doBlockingWrite(replyBuffer);
+ } catch (IOException e) {
+ log.trace(e, "Failed to send a reply to a service open request");
+ }
+ break;
+ }
+ case SERVICE_OPEN_FAILED:
+ case SERVICE_OPEN_NOT_FOUND:
+ case SERVICE_OPEN_FORBIDDEN: {
+ final int serviceId = buffer.getInt();
+ log.trace("Received a service open failure (%s) message for service %d", msgType, Integer.valueOf(serviceId));
+ final FutureRemoteRequestHandlerSource future = connection.removeFutureRemoteService(serviceId);
+ if (future == null) {
+ log.trace("Service open failure reply received for unknown service ID %d", Integer.valueOf(serviceId));
+ break;
+ }
+ future.setException(
+ msgType == MessageType.SERVICE_OPEN_NOT_FOUND ? new ServiceRegistrationException("Service not found") :
+ msgType == MessageType.SERVICE_OPEN_FORBIDDEN ? new ServiceRegistrationException("Service open forbidden") :
+ new ServiceRegistrationException("Service open failed")
+ );
+ break;
+ }
+ case SERVICE_OPEN_REPLY: {
+ final int serviceId = buffer.getInt();
+ final FutureRemoteRequestHandlerSource future = connection.getFutureRemoteService(serviceId);
+ if (future == null) {
+ log.trace("Service open reply received for unknown service ID %d", Integer.valueOf(serviceId));
+ break;
+ }
+ log.trace("Received a service open reply message for service %d for %s", Integer.valueOf(serviceId), future);
+ final MultiplexRequestHandlerSource requestHandlerSource = new MultiplexRequestHandlerSource(serviceId, connection);
+ future.setResult(requestHandlerSource);
+ break;
+ }
+ case SERVICE_CLOSE_NOTIFY: {
+ final int serviceId = buffer.getInt();
+ final FutureRemoteRequestHandlerSource future = connection.removeFutureRemoteService(serviceId);
+ log.trace("Received a service close notify message for service %d for %s", Integer.valueOf(serviceId), future);
+ future.addNotifier(IoUtils.<RequestHandlerSource>closingNotifier(), null);
+ break;
+ }
+ case SERVICE_CLOSE_REQUEST: {
+ final int serviceId = buffer.getInt();
+ final Handle<RequestHandlerSource> handle = connection.removeForwardedService(serviceId);
+ if (handle == null) {
+ log.trace("Received service close request on unknown ID %d", Integer.valueOf(serviceId));
+ break;
+ }
+ IoUtils.safeClose(handle);
+ break;
+ }
+ default: {
+ log.error("Malformed packet received (invalid message type %s)", msgType);
+ }
+ case CONNECTION_CLOSE:
+ break;
+ }
+ } catch (BufferUnderflowException e) {
+ log.error(e, "Malformed packet received (buffer underflow)");
+ }
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.log.Logger;
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.ByteOutput;
-import java.nio.ByteBuffer;
-import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- *
- */
-final class MultiplexReplyHandler implements ReplyHandler {
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.reply-handler");
-
- private final int requestId;
- private final MultiplexConnection connection;
-
- MultiplexReplyHandler(final int requestId, final MultiplexConnection connection) {
- this.requestId = requestId;
- this.connection = connection;
- }
-
- public void handleReply(final Object reply) throws IOException {
- log.trace("Sending outbound reply (request id = %d) (type is %s)", Integer.valueOf(requestId), reply == null ? "null" : reply.getClass());
- final MultiplexConnection connection = this.connection;
- final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
- try {
- final List<ByteBuffer> bufferList = new ArrayList<ByteBuffer>();
- final ByteOutput output = new BufferByteOutput(connection.getAllocator(), bufferList);
- try {
- marshaller.start(output);
- marshaller.write(MessageType.REPLY.getId());
- marshaller.writeInt(requestId);
- marshaller.writeObject(reply);
- marshaller.close();
- output.close();
- connection.doBlockingWrite(bufferList);
- log.trace("Sent reply %s", reply);
- } finally {
- IoUtils.safeClose(output);
- }
- } finally {
- IoUtils.safeClose(marshaller);
- }
- }
-
- public void handleException(final IOException exception) throws IOException {
- final MultiplexConnection connection = this.connection;
- final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
- try {
- final List<ByteBuffer> bufferList = new ArrayList<ByteBuffer>();
- final ByteOutput output = new BufferByteOutput(connection.getAllocator(), bufferList);
- try {
- marshaller.start(output);
- marshaller.write(MessageType.REQUEST_FAILED.getId());
- marshaller.writeInt(requestId);
- marshaller.writeObject(exception);
- marshaller.close();
- output.close();
- connection.doBlockingWrite(bufferList);
- } finally {
- IoUtils.safeClose(output);
- }
- } finally {
- IoUtils.safeClose(marshaller);
- }
- }
-
- public void handleCancellation() throws IOException {
- final ByteBuffer buffer = ByteBuffer.allocate(5);
- buffer.put((byte) MessageType.CANCEL_ACK.getId());
- buffer.putInt(requestId);
- buffer.flip();
- connection.doBlockingWrite(buffer);
- }
-
- public String toString() {
- return "forwarding reply handler <" + Integer.toHexString(hashCode()) + "> (request id = " + requestId + ") for " + connection;
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexReplyHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.ByteOutput;
+import java.nio.ByteBuffer;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ *
+ */
+final class MultiplexReplyHandler implements ReplyHandler {
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.reply-handler");
+
+ private final int requestId;
+ private final MultiplexConnection connection;
+
+ MultiplexReplyHandler(final int requestId, final MultiplexConnection connection) {
+ this.requestId = requestId;
+ this.connection = connection;
+ }
+
+ public void handleReply(final Object reply) throws IOException {
+ log.trace("Sending outbound reply (request id = %d) (type is %s)", Integer.valueOf(requestId), reply == null ? "null" : reply.getClass());
+ final MultiplexConnection connection = this.connection;
+ final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
+ try {
+ final List<ByteBuffer> bufferList = new ArrayList<ByteBuffer>();
+ final ByteOutput output = new BufferByteOutput(connection.getAllocator(), bufferList);
+ try {
+ marshaller.start(output);
+ marshaller.write(MessageType.REPLY.getId());
+ marshaller.writeInt(requestId);
+ marshaller.writeObject(reply);
+ marshaller.close();
+ output.close();
+ connection.doBlockingWrite(bufferList);
+ log.trace("Sent reply %s", reply);
+ } finally {
+ IoUtils.safeClose(output);
+ }
+ } finally {
+ IoUtils.safeClose(marshaller);
+ }
+ }
+
+ public void handleException(final IOException exception) throws IOException {
+ final MultiplexConnection connection = this.connection;
+ final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
+ try {
+ final List<ByteBuffer> bufferList = new ArrayList<ByteBuffer>();
+ final ByteOutput output = new BufferByteOutput(connection.getAllocator(), bufferList);
+ try {
+ marshaller.start(output);
+ marshaller.write(MessageType.REQUEST_FAILED.getId());
+ marshaller.writeInt(requestId);
+ marshaller.writeObject(exception);
+ marshaller.close();
+ output.close();
+ connection.doBlockingWrite(bufferList);
+ } finally {
+ IoUtils.safeClose(output);
+ }
+ } finally {
+ IoUtils.safeClose(marshaller);
+ }
+ }
+
+ public void handleCancellation() throws IOException {
+ final ByteBuffer buffer = ByteBuffer.allocate(5);
+ buffer.put((byte) MessageType.CANCEL_ACK.getId());
+ buffer.putInt(requestId);
+ buffer.flip();
+ connection.doBlockingWrite(buffer);
+ }
+
+ public String toString() {
+ return "forwarding reply handler <" + Integer.toHexString(hashCode()) + "> (request id = " + requestId + ") for " + connection;
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.xnio.BufferAllocator;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.log.Logger;
-import org.jboss.marshalling.Marshaller;
-import org.jboss.marshalling.ByteOutput;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.io.IOException;
-
-/**
- *
- */
-final class MultiplexRequestHandler extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.request-handler");
-
- private final int identifier;
- private final BufferAllocator<ByteBuffer> allocator;
- private final MultiplexConnection connection;
-
- public MultiplexRequestHandler(final int identifier, final MultiplexConnection connection) {
- super(connection.getExecutor());
- this.connection = connection;
- this.identifier = identifier;
- allocator = connection.getAllocator();
- }
-
- @Override
- protected void closeAction() throws IOException {
- connection.removeRemoteClient(identifier);
- ByteBuffer buffer = allocator.allocate();
- buffer.put((byte) MessageType.CLIENT_CLOSE.getId());
- buffer.putInt(identifier);
- buffer.flip();
- connection.doBlockingWrite(buffer);
- }
-
- public RemoteRequestContext receiveRequest(final Object request, final ReplyHandler handler) {
- log.trace("Sending outbound request (request id = %d) (type is %s)", request == null ? "null" : request.getClass());
- final List<ByteBuffer> bufferList;
- final MultiplexConnection connection = this.connection;
- try {
- final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
- try {
- bufferList = new ArrayList<ByteBuffer>();
- final ByteOutput output = new BufferByteOutput(allocator, bufferList);
- try {
- marshaller.start(output);
- marshaller.write(MessageType.REQUEST.getId());
- marshaller.writeInt(identifier);
- final int id = connection.nextRequest();
- connection.addRemoteRequest(id, handler);
- marshaller.writeInt(id);
- marshaller.writeObject(request);
- marshaller.close();
- output.close();
- connection.doBlockingWrite(bufferList);
- return new RemoteRequestContextImpl(id, connection);
- } finally {
- IoUtils.safeClose(output);
- }
- } finally {
- IoUtils.safeClose(marshaller);
- }
- } catch (final IOException t) {
- log.trace(t, "receiveRequest failed with an exception");
- SpiUtils.safeHandleException(handler, t);
- return SpiUtils.getBlankRemoteRequestContext();
- }
- }
-
- public String toString() {
- return "forwarding request handler <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
- }
-}
-
-final class RemoteRequestContextImpl implements RemoteRequestContext {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.requesthandler.context");
-
- private final int id;
- private final MultiplexConnection connection;
- private final AtomicBoolean cancelSent = new AtomicBoolean();
-
- public RemoteRequestContextImpl(final int id, final MultiplexConnection connection) {
- this.id = id;
- this.connection = connection;
- }
-
- public void cancel() {
- if (! cancelSent.getAndSet(true)) try {
- log.trace("Sending cancel request from %s", this);
- final ByteBuffer buffer = ByteBuffer.allocate(5);
- buffer.put((byte) MessageType.CANCEL_REQUEST.getId());
- buffer.putInt(id);
- buffer.flip();
- connection.doBlockingWrite(buffer);
- } catch (Throwable t) {
- log.warn("Sending cancel request failed: %s", t);
- }
- }
-
- public String toString() {
- return "remote request context <" + Integer.toHexString(hashCode()) + "> (request id = " + id + ") for " + connection;
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,136 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.xnio.BufferAllocator;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.marshalling.ByteOutput;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.io.IOException;
+
+/**
+ *
+ */
+final class MultiplexRequestHandler extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.request-handler");
+
+ private final int identifier;
+ private final BufferAllocator<ByteBuffer> allocator;
+ private final MultiplexConnection connection;
+
+ public MultiplexRequestHandler(final int identifier, final MultiplexConnection connection) {
+ super(connection.getExecutor());
+ this.connection = connection;
+ this.identifier = identifier;
+ allocator = connection.getAllocator();
+ }
+
+ @Override
+ protected void closeAction() throws IOException {
+ connection.removeRemoteClient(identifier);
+ ByteBuffer buffer = allocator.allocate();
+ buffer.put((byte) MessageType.CLIENT_CLOSE.getId());
+ buffer.putInt(identifier);
+ buffer.flip();
+ connection.doBlockingWrite(buffer);
+ }
+
+ public RemoteRequestContext receiveRequest(final Object request, final ReplyHandler handler) {
+ log.trace("Sending outbound request (request id = %d) (type is %s)", request == null ? "null" : request.getClass());
+ final List<ByteBuffer> bufferList;
+ final MultiplexConnection connection = this.connection;
+ try {
+ final Marshaller marshaller = connection.getMarshallerFactory().createMarshaller(connection.getMarshallingConfiguration());
+ try {
+ bufferList = new ArrayList<ByteBuffer>();
+ final ByteOutput output = new BufferByteOutput(allocator, bufferList);
+ try {
+ marshaller.start(output);
+ marshaller.write(MessageType.REQUEST.getId());
+ marshaller.writeInt(identifier);
+ final int id = connection.nextRequest();
+ connection.addRemoteRequest(id, handler);
+ marshaller.writeInt(id);
+ marshaller.writeObject(request);
+ marshaller.close();
+ output.close();
+ connection.doBlockingWrite(bufferList);
+ return new RemoteRequestContextImpl(id, connection);
+ } finally {
+ IoUtils.safeClose(output);
+ }
+ } finally {
+ IoUtils.safeClose(marshaller);
+ }
+ } catch (final IOException t) {
+ log.trace(t, "receiveRequest failed with an exception");
+ SpiUtils.safeHandleException(handler, t);
+ return SpiUtils.getBlankRemoteRequestContext();
+ }
+ }
+
+ public String toString() {
+ return "forwarding request handler <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
+ }
+}
+
+final class RemoteRequestContextImpl implements RemoteRequestContext {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.requesthandler.context");
+
+ private final int id;
+ private final MultiplexConnection connection;
+ private final AtomicBoolean cancelSent = new AtomicBoolean();
+
+ public RemoteRequestContextImpl(final int id, final MultiplexConnection connection) {
+ this.id = id;
+ this.connection = connection;
+ }
+
+ public void cancel() {
+ if (! cancelSent.getAndSet(true)) try {
+ log.trace("Sending cancel request from %s", this);
+ final ByteBuffer buffer = ByteBuffer.allocate(5);
+ buffer.put((byte) MessageType.CANCEL_REQUEST.getId());
+ buffer.putInt(id);
+ buffer.flip();
+ connection.doBlockingWrite(buffer);
+ } catch (Throwable t) {
+ log.warn("Sending cancel request failed: %s", t);
+ }
+ }
+
+ public String toString() {
+ return "remote request context <" + Integer.toHexString(hashCode()) + "> (request id = " + id + ") for " + connection;
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.log.Logger;
-import java.nio.ByteBuffer;
-import java.io.IOException;
-
-/**
- *
- */
-final class MultiplexRequestHandlerSource extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.request-handler-source");
-
- private final int identifier;
- private final MultiplexConnection connection;
-
- MultiplexRequestHandlerSource(final int identifier, final MultiplexConnection connection) {
- super(connection.getExecutor());
- this.connection = connection;
- this.identifier = identifier;
- }
-
- @Override
- protected void closeAction() throws IOException {
- ByteBuffer buffer = ByteBuffer.allocate(5);
- buffer.put((byte) MessageType.SERVICE_CLOSE_REQUEST.getId());
- buffer.putInt(identifier);
- buffer.flip();
- connection.doBlockingWrite(buffer);
- }
-
- public Handle<RequestHandler> createRequestHandler() throws IOException {
- log.trace("Creating new request handler from %s", this);
- final int id = connection.nextRemoteClient();
- final RequestHandler requestHandler = new MultiplexRequestHandler(id, connection);
- boolean ok = false;
- try {
- connection.addRemoteClient(id, requestHandler);
- try {
- final ByteBuffer buffer = ByteBuffer.allocate(9);
- buffer.put((byte) MessageType.CLIENT_OPEN.getId());
- buffer.putInt(identifier);
- buffer.putInt(id);
- buffer.flip();
- connection.doBlockingWrite(buffer);
- final Handle<RequestHandler> handlerHandle = new MultiplexRequestHandler(id, connection).getHandle();
- log.trace("Created new request handler with a handle of %s", handlerHandle);
- ok = true;
- return handlerHandle;
- } finally {
- if (! ok) {
- connection.removeRemoteClient(id);
- }
- }
- } finally {
- if (! ok) {
- IoUtils.safeClose(requestHandler);
- }
- }
- }
-
- public String toString() {
- return "forwarding request handler source <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/MultiplexRequestHandlerSource.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+import java.nio.ByteBuffer;
+import java.io.IOException;
+
+/**
+ *
+ */
+final class MultiplexRequestHandlerSource extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex.request-handler-source");
+
+ private final int identifier;
+ private final MultiplexConnection connection;
+
+ MultiplexRequestHandlerSource(final int identifier, final MultiplexConnection connection) {
+ super(connection.getExecutor());
+ this.connection = connection;
+ this.identifier = identifier;
+ }
+
+ @Override
+ protected void closeAction() throws IOException {
+ ByteBuffer buffer = ByteBuffer.allocate(5);
+ buffer.put((byte) MessageType.SERVICE_CLOSE_REQUEST.getId());
+ buffer.putInt(identifier);
+ buffer.flip();
+ connection.doBlockingWrite(buffer);
+ }
+
+ public Handle<RequestHandler> createRequestHandler() throws IOException {
+ log.trace("Creating new request handler from %s", this);
+ final int id = connection.nextRemoteClient();
+ final RequestHandler requestHandler = new MultiplexRequestHandler(id, connection);
+ boolean ok = false;
+ try {
+ connection.addRemoteClient(id, requestHandler);
+ try {
+ final ByteBuffer buffer = ByteBuffer.allocate(9);
+ buffer.put((byte) MessageType.CLIENT_OPEN.getId());
+ buffer.putInt(identifier);
+ buffer.putInt(id);
+ buffer.flip();
+ connection.doBlockingWrite(buffer);
+ final Handle<RequestHandler> handlerHandle = new MultiplexRequestHandler(id, connection).getHandle();
+ log.trace("Created new request handler with a handle of %s", handlerHandle);
+ ok = true;
+ return handlerHandle;
+ } finally {
+ if (! ok) {
+ connection.removeRemoteClient(id);
+ }
+ }
+ } finally {
+ if (! ok) {
+ IoUtils.safeClose(requestHandler);
+ }
+ }
+ }
+
+ public String toString() {
+ return "forwarding request handler source <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ServiceConfiguration.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ServiceConfiguration.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/ServiceConfiguration.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+/**
+ * A service configuration for a service registered on one side of a connection.
+ */
+public final class ServiceConfiguration implements Cloneable {
+ private String marshaller;
+
+ public String getMarshaller() {
+ return marshaller;
+ }
+
+ public void setMarshaller(final String marshaller) {
+ this.marshaller = marshaller;
+ }
+
+ public ServiceConfiguration clone() {
+ try {
+ return (ServiceConfiguration) super.clone();
+ } catch (CloneNotSupportedException e) {
+ // not possible
+ throw new IllegalStateException();
+ }
+ }
+}
Deleted: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/SimpleMultiplexHandler.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import org.jboss.xnio.DelegatingIoHandler;
-import org.jboss.xnio.AbstractIoFuture;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.remoting.Endpoint;
-
-/**
- *
- */
-public final class SimpleMultiplexHandler extends DelegatingIoHandler<AllocatedMessageChannel> {
-
- private volatile MultiplexConnection connection;
- private final Endpoint endpoint;
- private final MultiplexConfiguration configuration;
- private final FutureConnection futureConnection = new FutureConnection();
-
- public SimpleMultiplexHandler(final Endpoint endpoint, final MultiplexConfiguration configuration) {
- this.endpoint = endpoint;
- this.configuration = configuration;
- }
-
- public void handleOpened(final AllocatedMessageChannel channel) {
- connection = new MultiplexConnection(endpoint, channel, configuration);
- futureConnection.setResult(connection);
- setReadHandler(new MultiplexReadHandler(connection));
- channel.resumeReads();
- }
-
- public void handleClosed(final AllocatedMessageChannel channel) {
- IoUtils.safeClose(connection);
- }
-
- public IoFuture<MultiplexConnection> getConnection() {
- return futureConnection;
- }
-
- public static final class FutureConnection extends AbstractIoFuture<MultiplexConnection> {
- public IoFuture<MultiplexConnection> cancel() {
- return this;
- }
-
- protected boolean setResult(final MultiplexConnection result) {
- return super.setResult(result);
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol/multiplex/SimpleMultiplexHandler.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SimpleMultiplexHandler.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import org.jboss.xnio.DelegatingIoHandler;
+import org.jboss.xnio.AbstractIoFuture;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+
+/**
+ *
+ */
+public final class SimpleMultiplexHandler extends DelegatingIoHandler<AllocatedMessageChannel> {
+
+ private volatile MultiplexConnection connection;
+ private final MultiplexConfiguration configuration;
+ private final FutureConnection futureConnection = new FutureConnection();
+
+ public SimpleMultiplexHandler(final MultiplexConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ public void handleOpened(final AllocatedMessageChannel channel) {
+ connection = new MultiplexConnection(channel, configuration);
+ futureConnection.setResult(connection);
+ setReadHandler(new MultiplexReadHandler(connection));
+ channel.resumeReads();
+ }
+
+ public void handleClosed(final AllocatedMessageChannel channel) {
+ IoUtils.safeClose(connection);
+ }
+
+ public IoFuture<MultiplexConnection> getConnection() {
+ return futureConnection;
+ }
+
+ public static final class FutureConnection extends AbstractIoFuture<MultiplexConnection> {
+ public IoFuture<MultiplexConnection> cancel() {
+ return this;
+ }
+
+ protected boolean setResult(final MultiplexConnection result) {
+ return super.setResult(result);
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SynchronizedSet.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SynchronizedSet.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/SynchronizedSet.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.util.Set;
+import java.util.Iterator;
+import java.util.Collection;
+
+/**
+ *
+ */
+final class SynchronizedSet<E> implements Set<E> {
+ private final Set<E> delegate;
+ private final Object lock;
+
+ public SynchronizedSet(final Set<E> delegate, final Object lock) {
+ this.delegate = delegate;
+ this.lock = lock;
+ }
+
+ public int size() {
+ synchronized (lock) {
+ return delegate.size();
+ }
+ }
+
+ public boolean isEmpty() {
+ synchronized (lock) {
+ return delegate.isEmpty();
+ }
+ }
+
+ public boolean contains(final Object o) {
+ synchronized (lock) {
+ return delegate.contains(o);
+ }
+ }
+
+ public Iterator<E> iterator() {
+ synchronized (lock) {
+ final Iterator<E> i = delegate.iterator();
+ return new Iterator<E>() {
+ public boolean hasNext() {
+ synchronized (lock) {
+ return i.hasNext();
+ }
+ }
+
+ public E next() {
+ synchronized (lock) {
+ return i.next();
+ }
+ }
+
+ public void remove() {
+ synchronized (lock) {
+ i.remove();
+ }
+ }
+ };
+ }
+ }
+
+ public Object[] toArray() {
+ synchronized (lock) {
+ return delegate.toArray();
+ }
+ }
+
+ @SuppressWarnings({ "SuspiciousToArrayCall" })
+ public <T> T[] toArray(final T[] a) {
+ synchronized (lock) {
+ return delegate.<T>toArray(a);
+ }
+ }
+
+ public boolean add(final E e) {
+ synchronized (lock) {
+ return delegate.add(e);
+ }
+ }
+
+ public boolean remove(final Object o) {
+ synchronized (lock) {
+ return delegate.remove(o);
+ }
+ }
+
+ public boolean containsAll(final Collection<?> c) {
+ synchronized (lock) {
+ return delegate.containsAll(c);
+ }
+ }
+
+ public boolean addAll(final Collection<? extends E> c) {
+ synchronized (lock) {
+ return delegate.addAll(c);
+ }
+ }
+
+ public boolean retainAll(final Collection<?> c) {
+ synchronized (lock) {
+ return delegate.retainAll(c);
+ }
+ }
+
+ public boolean removeAll(final Collection<?> c) {
+ synchronized (lock) {
+ return delegate.removeAll(c);
+ }
+ }
+
+ public void clear() {
+ synchronized (lock) {
+ delegate.clear();
+ }
+ }
+
+ public boolean equals(final Object o) {
+ synchronized (lock) {
+ return delegate.equals(o);
+ }
+ }
+
+ public int hashCode() {
+ synchronized (lock) {
+ return delegate.hashCode();
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/impl/AbstractConnectionServiceProvider.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/impl/AbstractConnectionServiceProvider.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/impl/AbstractConnectionServiceProvider.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex.impl;
+
+import org.jboss.remoting3.multiplex.ConnectionServiceProvider;
+import org.jboss.remoting3.multiplex.ServiceConfiguration;
+import org.jboss.remoting3.multiplex.ConnectionServiceListener;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.AbstractSimpleCloseable;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.RemoteServiceConfiguration;
+import org.jboss.remoting3.SimpleCloseable;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.xnio.log.Logger;
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ *
+ */
+public abstract class AbstractConnectionServiceProvider<T> extends AbstractAutoCloseable<T> implements ConnectionServiceProvider {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.multiplex");
+
+ private final Executor executor;
+ private final ConnectionServiceProvider parent;
+ private final Lock registrationLock = new ReentrantLock();
+ private final Map<Object, ListenerRegistration> listenerRegistrations = new HashMap<Object, ListenerRegistration>();
+ private final Set<ServiceRegistration> serviceRegistrations = new HashSet<ServiceRegistration>();
+
+ protected AbstractConnectionServiceProvider(final Executor executor) {
+ super(executor);
+ this.executor = executor;
+ parent = null;
+ }
+
+ protected AbstractConnectionServiceProvider(final Executor executor, final ConnectionServiceProvider parent) {
+ super(executor);
+ this.executor = executor;
+ this.parent = parent;
+ }
+
+ public Handle<RequestHandlerSource> registerService(final QualifiedName path, final RemoteServiceConfiguration remoteServiceConfiguration, final ServiceConfiguration config) throws IOException {
+ return null;
+ }
+
+ // TODO - need a way to remotely convey the marshalling impl and configuration
+ public SimpleCloseable addServiceListener(final ConnectionServiceListener listener) {
+ final Object key = new Object();
+ final ListenerRegistration registration = new ListenerRegistration(executor, key, listener);
+ registrationLock.lock();
+ try {
+ listenerRegistrations.put(key, registration);
+ for (ServiceRegistration serviceRegistration : serviceRegistrations) {
+ handleRegistration(listener, registration, serviceRegistration);
+ }
+ } finally {
+ registrationLock.unlock();
+ }
+ return registration;
+ }
+
+ private void handleRegistration(ConnectionServiceListener listener, SimpleCloseable handle, ServiceRegistration registration) {
+ final ConnectionServiceListener.ServiceInfo info = new ConnectionServiceListener.ServiceInfo();
+ info.setEndpointName(registration.endpointName);
+ info.setGroupName(registration.groupName);
+ info.setMetric(registration.metric);
+ info.setPath(registration.path);
+ info.setRequestHandlerSource(registration.requestHandlerSource);
+ info.setServiceType(registration.serviceType);
+ try {
+ listener.serviceRegistered(handle, info);
+ } catch (Throwable t) {
+ log.error(t, "Connection service listener threw an exception");
+ }
+ }
+
+ private final class ListenerRegistration extends AbstractSimpleCloseable {
+ private final Object key;
+ private final ConnectionServiceListener listener;
+
+ private ListenerRegistration(final Executor executor, final Object key, final ConnectionServiceListener listener) {
+ super(executor);
+ this.key = key;
+ this.listener = listener;
+ }
+
+ protected void closeAction() throws IOException {
+ listenerRegistrations.remove(key);
+ }
+ }
+
+ private final class ServiceRegistration {
+ private final String serviceType;
+ private final String groupName;
+ private final String endpointName;
+ private final Handle<RequestHandlerSource> requestHandlerSource;
+ private final int metric;
+ private final MarshallerFactory marshallerFactory;
+ private final MarshallingConfiguration marshallingConfiguration;
+ private final QualifiedName path;
+
+ private ServiceRegistration(RemoteServiceConfiguration remoteServiceConfiguration, ServiceConfiguration serviceConfiguration, final QualifiedName path) throws IOException {
+ this.path = path;
+ serviceType = remoteServiceConfiguration.getServiceType();
+ groupName = remoteServiceConfiguration.getGroupName();
+ endpointName = remoteServiceConfiguration.getEndpointName();
+ requestHandlerSource = remoteServiceConfiguration.getRequestHandlerSource().getHandle();
+ metric = remoteServiceConfiguration.getMetric();
+ marshallerFactory = serviceConfiguration.getMarshallerFactory();
+ marshallingConfiguration = serviceConfiguration.getMarshallingConfiguration();
+ }
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/SAClassTable.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/SAClassTable.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/SAClassTable.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex.sa;
+
+import org.jboss.marshalling.ClassTable;
+import org.jboss.marshalling.Unmarshaller;
+import org.jboss.marshalling.Marshaller;
+import org.jboss.remoting3.QualifiedName;
+import java.io.IOException;
+import java.util.Map;
+import java.util.IdentityHashMap;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ *
+ */
+public final class SAClassTable implements ClassTable {
+
+ private static final Map<Class<?>, Writer> writerMap;
+ private static final List<Class<?>> readerList;
+
+ private static void add(Map<Class<?>, Writer> map, List<Class<?>> list, int id, Class<?> clazz) {
+ map.put(clazz, new IdWriter(id));
+ list.add(id, clazz);
+ }
+
+ static {
+ Map<Class<?>, Writer> map = new IdentityHashMap<Class<?>, Writer>();
+ List<Class<?>> list = new ArrayList<Class<?>>();
+
+ // These are the classes that comprise messages for this service
+ add(map, list, 0, ServiceAdvertisement.class);
+ add(map, list, 1, ServiceAdvertisementReply.class);
+ add(map, list, 2, QualifiedName.class);
+
+ writerMap = Collections.unmodifiableMap(map);
+ readerList = Collections.unmodifiableList(list);
+ }
+
+ private static final class IdWriter implements Writer {
+ private final byte id;
+
+ public IdWriter(final int id) {
+ this.id = (byte) id;
+ }
+
+ public void writeClass(final Marshaller marshaller, final Class<?> clazz) throws IOException {
+ marshaller.writeByte(id);
+ }
+ }
+
+ public Writer getClassWriter(final Class<?> clazz) throws IOException {
+ return writerMap.get(clazz);
+ }
+
+ public Class<?> readClass(final Unmarshaller unmarshaller) throws IOException, ClassNotFoundException {
+ return readerList.get(unmarshaller.read());
+ }
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisement.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisement.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisement.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex.sa;
+
+/**
+ *
+ */
+public final class ServiceAdvertisement {
+
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementReply.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementReply.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementReply.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex.sa;
+
+/**
+ *
+ */
+public final class ServiceAdvertisementReply {
+
+}
Added: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementRequestListener.java
===================================================================
--- remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementRequestListener.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/multiplex/sa/ServiceAdvertisementRequestListener.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex.sa;
+
+import org.jboss.remoting3.RequestContext;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.AbstractRequestListener;
+
+/**
+ *
+ */
+public final class ServiceAdvertisementRequestListener extends AbstractRequestListener<ServiceAdvertisement, ServiceAdvertisementReply> {
+
+ public void handleRequest(final RequestContext<ServiceAdvertisementReply> context, final ServiceAdvertisement request) throws RemoteExecutionException {
+
+ }
+}
Copied: remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting3/protocol (from rev 4858, remoting3-multiplex/trunk/main/src/main/java/org/jboss/remoting/protocol)
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3 (from rev 4848, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting)
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex (from rev 4848, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex)
Deleted: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java
===================================================================
--- remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex/ConnectionTestCase.java 2009-01-29 20:44:43 UTC (rev 4848)
+++ remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -1,181 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting.protocol.multiplex;
-
-import java.nio.ByteBuffer;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.CountDownLatch;
-import java.io.IOException;
-import junit.framework.TestCase;
-import org.jboss.remoting.core.EndpointImpl;
-import org.jboss.remoting.test.support.LoggingHelper;
-import org.jboss.remoting.LocalServiceConfiguration;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.ClientContext;
-import org.jboss.remoting.ServiceContext;
-import org.jboss.remoting.RequestContext;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.QualifiedName;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.BufferAllocator;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.Xnio;
-import org.jboss.xnio.CloseableExecutor;
-import org.jboss.xnio.ChannelSource;
-import org.jboss.xnio.IoHandlerFactory;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.Buffers;
-import org.jboss.xnio.log.Logger;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.xnio.channels.Channels;
-import org.jboss.xnio.nio.NioXnio;
-import org.jboss.river.RiverMarshallerFactory;
-import org.jboss.marshalling.MarshallingConfiguration;
-
-/**
- *
- */
-public final class ConnectionTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
-
- public static final Logger log = Logger.getLogger(ConnectionTestCase.class.getSimpleName());
-
- public void testConnection() throws Throwable {
- final String REQUEST = "request";
- final String REPLY = "reply";
- final List<Throwable> problems = Collections.synchronizedList(new LinkedList<Throwable>());
- final CloseableExecutor closeableExecutor = IoUtils.closeableExecutor(Executors.newCachedThreadPool(), 500L, TimeUnit.MILLISECONDS);
- try {
- final BufferAllocator<ByteBuffer> allocator = Buffers.createHeapByteBufferAllocator(1024);
- final Xnio xnio = NioXnio.create();
- try {
- final EndpointImpl remoteEndpoint = new EndpointImpl(closeableExecutor, "left-side");
- try {
- final EndpointImpl endpoint = new EndpointImpl(closeableExecutor, "right-side");
- try {
- final CountDownLatch latch = new CountDownLatch(1);
- final MultiplexConfiguration configuration = new MultiplexConfiguration();
- configuration.setAllocator(allocator);
- configuration.setExecutor(closeableExecutor);
- configuration.setLinkMetric(10);
- configuration.setMarshallerFactory(new RiverMarshallerFactory());
- final NamedServiceRegistry registry = new NamedServiceRegistry();
- configuration.setNamedServiceRegistry(registry);
- final MarshallingConfiguration marshallingConfiguration = new MarshallingConfiguration();
- configuration.setMarshallingConfiguration(marshallingConfiguration);
- final LocalServiceConfiguration<Object, Object> localServiceConfiguration = new LocalServiceConfiguration<Object, Object>(new RequestListener<Object, Object>() {
- public void handleClientOpen(final ClientContext context) {
- log.debug("Client open");
- }
-
- public void handleServiceOpen(final ServiceContext context) {
- }
-
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- try {
- context.sendReply(REPLY);
- } catch (IOException e) {
- log.error(e, "Failed to send reply");
- problems.add(e);
- }
- }
-
- public void handleServiceClose(final ServiceContext context) {
- }
-
- public void handleClientClose(final ClientContext context) {
- log.debug("Client closed");
- latch.countDown();
- }
-
- public String toString() {
- return "TestListener";
- }
- }, Object.class, Object.class);
- localServiceConfiguration.setServiceType("connection.test");
- localServiceConfiguration.setGroupName("testgroup");
- localServiceConfiguration.setMetric(10);
- final Handle<RequestHandlerSource> requestHandlerSourceHandle = remoteEndpoint.registerService(localServiceConfiguration);
- try {
- registry.registerService(QualifiedName.parse("/test/connectiontest"), requestHandlerSourceHandle.getResource());
- final IoHandlerFactory<AllocatedMessageChannel> handlerFactory = MultiplexProtocol.createServer(remoteEndpoint, configuration);
- final ChannelSource<AllocatedMessageChannel> channelSource = Channels.convertStreamToAllocatedMessage(xnio.createPipeServer(Channels.convertStreamToAllocatedMessage(handlerFactory, 16384, 16384)), 16384, 16384);
- final IoFuture<MultiplexConnection> future = MultiplexProtocol.connect(endpoint, configuration, channelSource);
- final MultiplexConnection connection = future.get();
- try {
- final Handle<RequestHandlerSource> remoteHandlerSource = connection.openRemoteService(QualifiedName.parse("/test/connectiontest"));
- try {
- final ClientSource<Object, Object> clientSource = endpoint.createClientSource(remoteHandlerSource.getResource(), Object.class, Object.class);
- try {
- final Client<Object,Object> client = clientSource.createClient();
- try {
- final IoFuture<Object> futureReply = client.send(REQUEST);
- assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
- assertEquals(REPLY, futureReply.get());
- client.close();
- clientSource.close();
- remoteHandlerSource.close();
- connection.close();
- assertTrue(latch.await(1L, TimeUnit.SECONDS));
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(clientSource);
- }
- } finally {
- IoUtils.safeClose(remoteHandlerSource);
- }
- } finally {
- IoUtils.safeClose(connection);
- }
- } finally {
- IoUtils.safeClose(requestHandlerSourceHandle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- IoUtils.safeClose(remoteEndpoint);
- }
- } finally {
- IoUtils.safeClose(xnio);
- }
- } finally {
- IoUtils.safeClose(closeableExecutor);
- }
- for (Throwable t : problems) {
- throw t;
- }
- }
-}
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java (from rev 4858, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol/multiplex/ConnectionTestCase.java)
===================================================================
--- remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java (rev 0)
+++ remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/multiplex/ConnectionTestCase.java 2009-02-26 21:52:06 UTC (rev 4859)
@@ -0,0 +1,178 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.multiplex;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CountDownLatch;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.jboss.remoting3.LocalServiceConfiguration;
+import org.jboss.remoting3.RequestListener;
+import org.jboss.remoting3.ClientContext;
+import org.jboss.remoting3.ServiceContext;
+import org.jboss.remoting3.RequestContext;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.ClientSource;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.BufferAllocator;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.Xnio;
+import org.jboss.xnio.CloseableExecutor;
+import org.jboss.xnio.ChannelSource;
+import org.jboss.xnio.IoHandlerFactory;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.Buffers;
+import org.jboss.xnio.log.Logger;
+import org.jboss.xnio.channels.AllocatedMessageChannel;
+import org.jboss.xnio.channels.Channels;
+import org.jboss.xnio.nio.NioXnio;
+import org.jboss.marshalling.MarshallingConfiguration;
+import org.jboss.marshalling.river.RiverMarshallerFactory;
+
+/**
+ *
+ */
+public final class ConnectionTestCase extends TestCase {
+
+ public static final Logger log = Logger.getLogger(ConnectionTestCase.class.getSimpleName());
+
+ public void testConnection() throws Throwable {
+ final String REQUEST = "request";
+ final String REPLY = "reply";
+ final List<Throwable> problems = Collections.synchronizedList(new LinkedList<Throwable>());
+ final CloseableExecutor closeableExecutor = IoUtils.closeableExecutor(Executors.newCachedThreadPool(), 500L, TimeUnit.MILLISECONDS);
+ try {
+ final BufferAllocator<ByteBuffer> allocator = Buffers.createHeapByteBufferAllocator(1024);
+ final Xnio xnio = NioXnio.create();
+ try {
+ final Endpoint remoteEndpoint = Remoting.createEndpoint(closeableExecutor, "left-side");
+ try {
+ final Endpoint endpoint = Remoting.createEndpoint(closeableExecutor, "right-side");
+ try {
+ final CountDownLatch latch = new CountDownLatch(1);
+ final MultiplexConfiguration configuration = new MultiplexConfiguration();
+ configuration.setAllocator(allocator);
+ configuration.setExecutor(closeableExecutor);
+ configuration.setLinkMetric(10);
+ configuration.setMarshallerFactory(new RiverMarshallerFactory());
+ final NamedServiceRegistry registry = new NamedServiceRegistry();
+ configuration.setNamedServiceRegistry(registry);
+ final MarshallingConfiguration marshallingConfiguration = new MarshallingConfiguration();
+ configuration.setMarshallingConfiguration(marshallingConfiguration);
+ final LocalServiceConfiguration<Object, Object> localServiceConfiguration = new LocalServiceConfiguration<Object, Object>(new RequestListener<Object, Object>() {
+ public void handleClientOpen(final ClientContext context) {
+ log.debug("Client open");
+ }
+
+ public void handleServiceOpen(final ServiceContext context) {
+ }
+
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ try {
+ context.sendReply(REPLY);
+ } catch (IOException e) {
+ log.error(e, "Failed to send reply");
+ problems.add(e);
+ }
+ }
+
+ public void handleServiceClose(final ServiceContext context) {
+ }
+
+ public void handleClientClose(final ClientContext context) {
+ log.debug("Client closed");
+ latch.countDown();
+ }
+
+ public String toString() {
+ return "TestListener";
+ }
+ }, Object.class, Object.class);
+ localServiceConfiguration.setServiceType("connection.test");
+ localServiceConfiguration.setGroupName("testgroup");
+ localServiceConfiguration.setMetric(10);
+ final Handle<RequestHandlerSource> requestHandlerSourceHandle = remoteEndpoint.registerService(localServiceConfiguration);
+ try {
+ registry.registerService(QualifiedName.parse("/test/connectiontest"), requestHandlerSourceHandle.getResource());
+ final IoHandlerFactory<AllocatedMessageChannel> handlerFactory = MultiplexProtocol.createServer(configuration);
+ final ChannelSource<AllocatedMessageChannel> channelSource = Channels.convertStreamToAllocatedMessage(xnio.createPipeServer(Channels.convertStreamToAllocatedMessage(handlerFactory, 16384, 16384)), 16384, 16384);
+ final IoFuture<MultiplexConnection> future = MultiplexProtocol.connect(configuration, channelSource);
+ final MultiplexConnection connection = future.get();
+ try {
+ final Handle<RequestHandlerSource> remoteHandlerSource = connection.openRemoteService(QualifiedName.parse("/test/connectiontest"));
+ try {
+ final ClientSource<Object, Object> clientSource = endpoint.createClientSource(remoteHandlerSource.getResource(), Object.class, Object.class);
+ try {
+ final Client<Object,Object> client = clientSource.createClient();
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(REQUEST);
+ assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
+ assertEquals(REPLY, futureReply.get());
+ client.close();
+ clientSource.close();
+ remoteHandlerSource.close();
+ connection.close();
+ assertTrue(latch.await(1L, TimeUnit.SECONDS));
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(clientSource);
+ }
+ } finally {
+ IoUtils.safeClose(remoteHandlerSource);
+ }
+ } finally {
+ IoUtils.safeClose(connection);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandlerSourceHandle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ IoUtils.safeClose(remoteEndpoint);
+ }
+ } finally {
+ IoUtils.safeClose(xnio);
+ }
+ } finally {
+ IoUtils.safeClose(closeableExecutor);
+ }
+ for (Throwable t : problems) {
+ throw t;
+ }
+ }
+}
Copied: remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting3/protocol (from rev 4858, remoting3-multiplex/trunk/main/src/test/java/org/jboss/remoting/protocol)
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4858 - in remoting3/trunk: api/src/main/java/org/jboss and 18 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 16:50:42 -0500 (Thu, 26 Feb 2009)
New Revision: 4858
Added:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/
remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.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/EndpointPermission.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/IndeterminateOutcomeException.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/LocalServiceConfiguration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.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/RequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/
remoting3/trunk/api/src/test/java/org/jboss/remoting3/
remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/
remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream/
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/
Removed:
remoting3/trunk/api/src/main/java/org/jboss/remoting/
remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.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/EndpointPermission.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/IndeterminateOutcomeException.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/LocalServiceConfiguration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.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/RequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/
remoting3/trunk/api/src/test/java/org/jboss/remoting/
remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/
remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream/
remoting3/trunk/compat/src/main/java/org/jboss/remoting/
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/
remoting3/trunk/protocol/
remoting3/trunk/samples/src/main/java/org/jboss/remoting/
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/
remoting3/trunk/samples/src/test/java/org/jboss/remoting/
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractSimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/Handle.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RemoteRequestContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/ReplyHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandlerSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/SpiUtils.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/Streams.java
remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/package-info.java
remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml
remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/CloseableTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/NameTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream/StreamsTestCase.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityClassResolver.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationRequest.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationResponse.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityCallback.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityClient.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityHome.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityInvokerLocator.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/Request.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingReplyHandler.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingRequestHandler.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingReplyHandler.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingRequestHandler.java
remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/package-info.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicConfiguration.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicHandlerReplyConsumer.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicProtocol.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicRequestHandler.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerReplyTransmitter.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerRequestConsumer.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/FutureBasicReply.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalBasicExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalStreamExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexClientExample.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StreamingRot13RequestListener.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StringRot13RequestListener.java
remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java
Log:
org.jboss.remoting -> org.jboss.remoting3
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3 (from rev 4855, remoting3/trunk/api/src/main/java/org/jboss/remoting)
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import org.jboss.remoting.spi.AbstractHandleableCloseable;
-
-/**
- *
- */
-abstract class AbstractContextImpl<T> extends AbstractHandleableCloseable<T> {
-
- private final ConcurrentMap<Object, Object> attributes = new ConcurrentHashMap<Object, Object>();
-
- AbstractContextImpl(final Executor executor) {
- super(executor);
- }
-
- public ConcurrentMap<Object, Object> getAttributes() {
- return attributes;
- }
-
- protected Executor getExecutor() {
- return super.getExecutor();
- }
-
- protected boolean isOpen() {
- return super.isOpen();
- }
-
- public String toString() {
- return "generic context instance <" + Integer.toHexString(hashCode()) + ">";
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import org.jboss.remoting3.spi.AbstractHandleableCloseable;
+
+/**
+ *
+ */
+abstract class AbstractContextImpl<T> extends AbstractHandleableCloseable<T> {
+
+ private final ConcurrentMap<Object, Object> attributes = new ConcurrentHashMap<Object, Object>();
+
+ AbstractContextImpl(final Executor executor) {
+ super(executor);
+ }
+
+ public ConcurrentMap<Object, Object> getAttributes() {
+ return attributes;
+ }
+
+ protected Executor getExecutor() {
+ return super.getExecutor();
+ }
+
+ protected boolean isOpen() {
+ return super.isOpen();
+ }
+
+ public String toString() {
+ return "generic context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,34 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * A simple request listener implementation that implements all methods with no-operation implementations.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public abstract class AbstractRequestListener<I, O> implements RequestListener<I, O> {
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleClientOpen(final ClientContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleServiceOpen(final ServiceContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleServiceClose(final ServiceContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleClientClose(final ClientContext context) {
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/AbstractRequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,34 @@
+package org.jboss.remoting3;
+
+/**
+ * A simple request listener implementation that implements all methods with no-operation implementations.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public abstract class AbstractRequestListener<I, O> implements RequestListener<I, O> {
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleClientOpen(final ClientContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleServiceOpen(final ServiceContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleServiceClose(final ServiceContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleClientClose(final ClientContext context) {
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,95 +0,0 @@
-package org.jboss.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CancellationException;
-import java.io.IOException;
-import java.io.ObjectStreamException;
-import org.jboss.xnio.IoFuture;
-
-/**
- * A communications client. The client may be associated with state maintained by the local and/or remote side.
- *
- * @param <I> the request type
- * @param <O> the reply type
- *
- * @apiviz.landmark
- */
-public interface Client<I, O> extends HandleableCloseable<Client<I, O>> {
- /**
- * Send a request and block until a reply is received. If the remote side manipulates a stream, the
- * current thread may be used to handle it.
- * <p/>
- * If the operation is cancelled asynchronously, a {@code CancellationException} is thrown. This exception indicates
- * that the request was received and was executed, but a cancellation request was received and handled before the
- * reply was able to be sent. The remote service will have cleanly cancelled the operation. This exception type
- * is a {@code RuntimeException}; thus direct handling of this exception is optional (depending on your use case).
- * <p/>
- * If the request is sent but the remote side sends an exception back, a {@code RemoteExecutionException} is thrown
- * with the cause and message initialized by the remote service. This exception indicates an error in the execution
- * of the service's {@code RequestListener}. The service will have cleanly recovered from such an exception.
- * <p/>
- * If the request is sent and the remote side tries to reply, but sending the reply fails, a
- * {@code RemoteReplyException} is thrown, possibly with the cause initialized to the reason of the failure. Typically
- * this exception is thrown when serialization of the reply failed for some reason. This exception type extends
- * {@code RemoteExecutionException} and can be treated similarly in most cases.
- * <p/>
- * If the request is sent and the remote side sends the reply successfully but there is an error reading the reply
- * locally, a {@code ReplyException} is thrown. In this case the operation is known to have completed without error
- * but the actual detailed reply cannot be known. In cases where the reply would be ignored anyway, this exception
- * type may be safely ignored (possibly logging it for informational purposes). This exception is typically caused
- * by an {@code ObjectStreamException} thrown while unmarshalling the reply, though other causes are also possible.
- * <p/>
- * If the result of the operation is known to be impossible to ascertain, then an {@code IndeterminateOutcomeException}
- * is thrown. Possible causes of this condition include (but are not limited to) the connection to the remote side
- * being unexpectedly broken, or the current thread being interrupted before the reply can be read. In the latter
- * case, a best effort is automatically made to attempt to cancel the outstanding operation, though there is no
- * guarantee.
- * <p/>
- * If the request cannot be sent, some other {@code IOException} will be thrown with the reason, including (but not limited to)
- * attempting to call this method on a closed client, or {@code ObjectStreamException}s related to marshalling the
- * request locally or unmarshalling it remotely. Such an exception indicates that the remote side did not receive
- * the request.
- * <p/>
- * All these exceptions (apart from {@code CancellationException}) extend {@code IOException} which makes it easier
- * to selectively catch only those exceptions that you need to implement special policy for, while relegating the
- * rest to common handlers.
- *
- * @param request the request to send
- *
- * @return the result of the request
- *
- * @throws CancellationException if the operation was cancelled asynchronously
- * @throws RemoteExecutionException if the remote handler threw an exception
- * @throws RemoteReplyException if the remote side was unable to send the response
- * @throws ReplyException if the operation succeeded but the reply cannot be read for some reason
- * @throws IndeterminateOutcomeException if the result of the operation cannot be ascertained
- * @throws ObjectStreamException if marshalling or unmarshalling some part of the request failed
- * @throws IOException if some I/O error occurred while sending the request
- */
- O invoke(I request) throws IOException, CancellationException;
-
- /**
- * Send a request asynchronously. If the remote side manipulates a stream, it
- * may use a local policy to assign one or more thread(s) to handle the local end of that stream, or it may
- * fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
- * <p/>
- * Returns immediately. The returned {@code IoFuture} object can be queried at a later time to determine the result
- * of the operation. If the operation fails, one of the conditions described on the {@link #invoke(Object) invoke(I)}
- * method will result. This condition can be determined by reading the status of the {@code IoFuture} object or
- * by attempting to read the result.
- *
- * @param request the request to send
- *
- * @return a future representing the result of the request
- *
- * @throws IOException if the request could not be sent
- */
- IoFuture<? extends O> send(I request) throws IOException;
-
- /**
- * Get the attribute map. This map holds metadata about the current clinet.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Client.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,95 @@
+package org.jboss.remoting3;
+
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CancellationException;
+import java.io.IOException;
+import java.io.ObjectStreamException;
+import org.jboss.xnio.IoFuture;
+
+/**
+ * A communications client. The client may be associated with state maintained by the local and/or remote side.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ *
+ * @apiviz.landmark
+ */
+public interface Client<I, O> extends HandleableCloseable<Client<I, O>> {
+ /**
+ * Send a request and block until a reply is received. If the remote side manipulates a stream, the
+ * current thread may be used to handle it.
+ * <p/>
+ * If the operation is cancelled asynchronously, a {@code CancellationException} is thrown. This exception indicates
+ * that the request was received and was executed, but a cancellation request was received and handled before the
+ * reply was able to be sent. The remote service will have cleanly cancelled the operation. This exception type
+ * is a {@code RuntimeException}; thus direct handling of this exception is optional (depending on your use case).
+ * <p/>
+ * If the request is sent but the remote side sends an exception back, a {@code RemoteExecutionException} is thrown
+ * with the cause and message initialized by the remote service. This exception indicates an error in the execution
+ * of the service's {@code RequestListener}. The service will have cleanly recovered from such an exception.
+ * <p/>
+ * If the request is sent and the remote side tries to reply, but sending the reply fails, a
+ * {@code RemoteReplyException} is thrown, possibly with the cause initialized to the reason of the failure. Typically
+ * this exception is thrown when serialization of the reply failed for some reason. This exception type extends
+ * {@code RemoteExecutionException} and can be treated similarly in most cases.
+ * <p/>
+ * If the request is sent and the remote side sends the reply successfully but there is an error reading the reply
+ * locally, a {@code ReplyException} is thrown. In this case the operation is known to have completed without error
+ * but the actual detailed reply cannot be known. In cases where the reply would be ignored anyway, this exception
+ * type may be safely ignored (possibly logging it for informational purposes). This exception is typically caused
+ * by an {@code ObjectStreamException} thrown while unmarshalling the reply, though other causes are also possible.
+ * <p/>
+ * If the result of the operation is known to be impossible to ascertain, then an {@code IndeterminateOutcomeException}
+ * is thrown. Possible causes of this condition include (but are not limited to) the connection to the remote side
+ * being unexpectedly broken, or the current thread being interrupted before the reply can be read. In the latter
+ * case, a best effort is automatically made to attempt to cancel the outstanding operation, though there is no
+ * guarantee.
+ * <p/>
+ * If the request cannot be sent, some other {@code IOException} will be thrown with the reason, including (but not limited to)
+ * attempting to call this method on a closed client, or {@code ObjectStreamException}s related to marshalling the
+ * request locally or unmarshalling it remotely. Such an exception indicates that the remote side did not receive
+ * the request.
+ * <p/>
+ * All these exceptions (apart from {@code CancellationException}) extend {@code IOException} which makes it easier
+ * to selectively catch only those exceptions that you need to implement special policy for, while relegating the
+ * rest to common handlers.
+ *
+ * @param request the request to send
+ *
+ * @return the result of the request
+ *
+ * @throws CancellationException if the operation was cancelled asynchronously
+ * @throws RemoteExecutionException if the remote handler threw an exception
+ * @throws RemoteReplyException if the remote side was unable to send the response
+ * @throws ReplyException if the operation succeeded but the reply cannot be read for some reason
+ * @throws IndeterminateOutcomeException if the result of the operation cannot be ascertained
+ * @throws ObjectStreamException if marshalling or unmarshalling some part of the request failed
+ * @throws IOException if some I/O error occurred while sending the request
+ */
+ O invoke(I request) throws IOException, CancellationException;
+
+ /**
+ * Send a request asynchronously. If the remote side manipulates a stream, it
+ * may use a local policy to assign one or more thread(s) to handle the local end of that stream, or it may
+ * fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
+ * <p/>
+ * Returns immediately. The returned {@code IoFuture} object can be queried at a later time to determine the result
+ * of the operation. If the operation fails, one of the conditions described on the {@link #invoke(Object) invoke(I)}
+ * method will result. This condition can be determined by reading the status of the {@code IoFuture} object or
+ * by attempting to read the result.
+ *
+ * @param request the request to send
+ *
+ * @return a future representing the result of the request
+ *
+ * @throws IOException if the request could not be sent
+ */
+ IoFuture<? extends O> send(I request) throws IOException;
+
+ /**
+ * Get the attribute map. This map holds metadata about the current clinet.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,25 +0,0 @@
-package org.jboss.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * The server context for a single remote client instance.
- *
- * @apiviz.exclude
- */
-public interface ClientContext extends HandleableCloseable<ClientContext> {
- /**
- * Get the attributes for this end of the channel as a map.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-
- /**
- * Get the service that this context is associated with, or {@code null} if there is no
- * service.
- *
- * @return the service, or {@code null} if there is none
- */
- ServiceContext getServiceContext();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,25 @@
+package org.jboss.remoting3;
+
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * The server context for a single remote client instance.
+ *
+ * @apiviz.exclude
+ */
+public interface ClientContext extends HandleableCloseable<ClientContext> {
+ /**
+ * Get the attributes for this end of the channel as a map.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+
+ /**
+ * Get the service that this context is associated with, or {@code null} if there is no
+ * service.
+ *
+ * @return the service, or {@code null} if there is none
+ */
+ ServiceContext getServiceContext();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.concurrent.Executor;
-import org.jboss.remoting.ClientContext;
-import org.jboss.remoting.ServiceContext;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class ClientContextImpl extends AbstractContextImpl<ClientContext> implements ClientContext {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.client-context");
-
- private final ServiceContextImpl serviceContext;
-
- ClientContextImpl(final Executor executor) {
- super(executor);
- serviceContext = null;
- }
-
- ClientContextImpl(final ServiceContextImpl serviceContext) {
- super(serviceContext.getExecutor());
- this.serviceContext = serviceContext;
- }
-
- public ServiceContext getServiceContext() {
- return serviceContext;
- }
-
- public String toString() {
- return "client context instance <" + Integer.toHexString(hashCode()) + ">";
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+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;
+
+/**
+ *
+ */
+final class ClientContextImpl extends AbstractContextImpl<ClientContext> implements ClientContext {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client-context");
+
+ private final ServiceContextImpl serviceContext;
+
+ ClientContextImpl(final Executor executor) {
+ super(executor);
+ serviceContext = null;
+ }
+
+ ClientContextImpl(final ServiceContextImpl serviceContext) {
+ super(serviceContext.getExecutor());
+ this.serviceContext = serviceContext;
+ }
+
+ public ServiceContext getServiceContext() {
+ return serviceContext;
+ }
+
+ public String toString() {
+ return "client context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import org.jboss.marshalling.Creator;
-import org.jboss.marshalling.Externalizer;
-import org.jboss.remoting.spi.RequestHandler;
-
-/**
- *
- */
-final class ClientExternalizer implements Externalizer {
-
- private static final long serialVersionUID = 814228455390899997L;
-
- private final EndpointImpl endpoint;
-
- ClientExternalizer(final EndpointImpl endpoint) {
- this.endpoint = endpoint;
- }
-
- private static <I, O> void doWriteExternal(final ClientImpl<I, O> client, final ObjectOutput output) throws IOException {
- output.writeObject(client.getRequestClass());
- output.writeObject(client.getReplyClass());
- output.writeObject(client.getRequestHandlerHandle().getResource());
- }
-
- public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
- doWriteExternal((ClientImpl<?, ?>) o, output);
- }
-
- private <I, O> ClientImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandler handler) throws IOException {
- return ClientImpl.create(handler.getHandle(), endpoint.getExecutor(), requestClass, replyClass);
- }
-
- public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
- final Class<?> requestClass = (Class<?>) input.readObject();
- final Class<?> replyClass = (Class<?>) input.readObject();
- final RequestHandler handler = (RequestHandler) input.readObject();
- return doCreateExternal(requestClass, replyClass, handler);
- }
-
- public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
- // no op
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientExternalizer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.jboss.marshalling.Creator;
+import org.jboss.marshalling.Externalizer;
+import org.jboss.remoting3.spi.RequestHandler;
+
+/**
+ *
+ */
+final class ClientExternalizer implements Externalizer {
+
+ private static final long serialVersionUID = 814228455390899997L;
+
+ private final EndpointImpl endpoint;
+
+ ClientExternalizer(final EndpointImpl endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ private static <I, O> void doWriteExternal(final ClientImpl<I, O> client, final ObjectOutput output) throws IOException {
+ output.writeObject(client.getRequestClass());
+ output.writeObject(client.getReplyClass());
+ output.writeObject(client.getRequestHandlerHandle().getResource());
+ }
+
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ doWriteExternal((ClientImpl<?, ?>) o, output);
+ }
+
+ private <I, O> ClientImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandler handler) throws IOException {
+ return ClientImpl.create(handler.getHandle(), endpoint.getExecutor(), requestClass, replyClass);
+ }
+
+ public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final Class<?> requestClass = (Class<?>) input.readObject();
+ final Class<?> replyClass = (Class<?>) input.readObject();
+ final RequestHandler handler = (RequestHandler) input.readObject();
+ return doCreateExternal(requestClass, replyClass, handler);
+ }
+
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // no op
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,140 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.IndeterminateOutcomeException;
-import org.jboss.remoting.RemoteRequestException;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class ClientImpl<I, O> extends AbstractContextImpl<Client<I, O>> implements Client<I, O> {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.client");
-
- private final Handle<RequestHandler> handle;
- private final Class<I> requestClass;
- private final Class<O> replyClass;
-
- private ClientImpl(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
- super(executor);
- this.handle = handle;
- this.requestClass = requestClass;
- this.replyClass = replyClass;
- }
-
- static <I, O> ClientImpl<I, O> create(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
- final ClientImpl<I, O> ci = new ClientImpl<I, O>(handle, executor, requestClass, replyClass);
- handle.addCloseHandler(new CloseHandler<Handle<RequestHandler>>() {
- public void handleClose(final Handle<RequestHandler> closed) {
- IoUtils.safeClose(ci);
- }
- });
- return ci;
- }
-
- protected void closeAction() throws IOException {
- handle.close();
- }
-
- public O invoke(final I request) throws IOException {
- if (! isOpen()) {
- throw new IOException("Client is not open");
- }
- log.trace("Client.invoke() sending request \"%s\"", request);
- final I actualRequest = castRequest(request);
- final QueueExecutor executor = new QueueExecutor();
- final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
- final ReplyHandler replyHandler = futureReply.getReplyHandler();
- final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
- futureReply.setRemoteRequestContext(requestContext);
- futureReply.addNotifier(IoUtils.<O>attachmentClosingNotifier(), executor);
- executor.runQueue();
- try {
- final O reply = futureReply.getInterruptibly();
- log.trace("Client.invoke() received reply \"%s\"", reply);
- return reply;
- } catch (InterruptedException e) {
- try {
- futureReply.cancel();
- throw new IndeterminateOutcomeException("The current thread was interrupted before the result could be read");
- } finally {
- Thread.currentThread().interrupt();
- }
- }
- }
-
- public IoFuture<? extends O> send(final I request) throws IOException {
- if (! isOpen()) {
- throw new IOException("Client is not open");
- }
- log.trace("Client.send() sending request \"%s\"", request);
- final I actualRequest = castRequest(request);
- final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
- final ReplyHandler replyHandler = futureReply.getReplyHandler();
- final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
- futureReply.setRemoteRequestContext(requestContext);
- return futureReply;
- }
-
- /**
- * Since type is erased, it's possible that the wrong type was passed.
- * @param request
- * @return
- * @throws RemoteRequestException
- */
- private I castRequest(final Object request) throws RemoteRequestException {
- try {
- return requestClass.cast(request);
- } catch (ClassCastException e) {
- throw new RemoteRequestException("Invalid request type sent (got <" + request.getClass().getName() + ">, expected <? extends " + requestClass.getName() + ">");
- }
- }
-
- public String toString() {
- return "client instance <" + Integer.toHexString(hashCode()) + ">";
- }
-
- Handle<RequestHandler> getRequestHandlerHandle() {
- return handle;
- }
-
- Class<I> getRequestClass() {
- return requestClass;
- }
-
- Class<O> getReplyClass() {
- return replyClass;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+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;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ClientImpl<I, O> extends AbstractContextImpl<Client<I, O>> implements Client<I, O> {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client");
+
+ private final Handle<RequestHandler> handle;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private ClientImpl(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
+ super(executor);
+ this.handle = handle;
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ static <I, O> ClientImpl<I, O> create(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
+ final ClientImpl<I, O> ci = new ClientImpl<I, O>(handle, executor, requestClass, replyClass);
+ handle.addCloseHandler(new CloseHandler<Handle<RequestHandler>>() {
+ public void handleClose(final Handle<RequestHandler> closed) {
+ IoUtils.safeClose(ci);
+ }
+ });
+ return ci;
+ }
+
+ protected void closeAction() throws IOException {
+ handle.close();
+ }
+
+ public O invoke(final I request) throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client is not open");
+ }
+ log.trace("Client.invoke() sending request \"%s\"", request);
+ final I actualRequest = castRequest(request);
+ final QueueExecutor executor = new QueueExecutor();
+ final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
+ final ReplyHandler replyHandler = futureReply.getReplyHandler();
+ final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
+ futureReply.setRemoteRequestContext(requestContext);
+ futureReply.addNotifier(IoUtils.<O>attachmentClosingNotifier(), executor);
+ executor.runQueue();
+ try {
+ final O reply = futureReply.getInterruptibly();
+ log.trace("Client.invoke() received reply \"%s\"", reply);
+ return reply;
+ } catch (InterruptedException e) {
+ try {
+ futureReply.cancel();
+ throw new IndeterminateOutcomeException("The current thread was interrupted before the result could be read");
+ } finally {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ public IoFuture<? extends O> send(final I request) throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client is not open");
+ }
+ log.trace("Client.send() sending request \"%s\"", request);
+ final I actualRequest = castRequest(request);
+ final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
+ final ReplyHandler replyHandler = futureReply.getReplyHandler();
+ final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
+ futureReply.setRemoteRequestContext(requestContext);
+ return futureReply;
+ }
+
+ /**
+ * Since type is erased, it's possible that the wrong type was passed.
+ * @param request
+ * @return
+ * @throws RemoteRequestException
+ */
+ private I castRequest(final Object request) throws RemoteRequestException {
+ try {
+ return requestClass.cast(request);
+ } catch (ClassCastException e) {
+ throw new RemoteRequestException("Invalid request type sent (got <" + request.getClass().getName() + ">, expected <? extends " + requestClass.getName() + ">");
+ }
+ }
+
+ public String toString() {
+ return "client instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+
+ Handle<RequestHandler> getRequestHandlerHandle() {
+ return handle;
+ }
+
+ Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ Class<O> getReplyClass() {
+ return replyClass;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,24 +0,0 @@
-package org.jboss.remoting;
-
-import java.io.IOException;
-
-/**
- * A source for new Remoting contexts.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public interface ClientSource<I, O> extends HandleableCloseable<ClientSource<I, O>> {
- /**
- * Close the context source. New contexts may no longer be created after this
- * method is called. Subsequent calls to this method have no additional effect.
- */
- void close() throws IOException;
-
- /**
- * Create a new communications context.
- *
- * @return the new context
- */
- Client<I, O> createClient() throws IOException;
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,24 @@
+package org.jboss.remoting3;
+
+import java.io.IOException;
+
+/**
+ * A source for new Remoting contexts.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public interface ClientSource<I, O> extends HandleableCloseable<ClientSource<I, O>> {
+ /**
+ * Close the context source. New contexts may no longer be created after this
+ * method is called. Subsequent calls to this method have no additional effect.
+ */
+ void close() throws IOException;
+
+ /**
+ * Create a new communications context.
+ *
+ * @return the new context
+ */
+ Client<I, O> createClient() throws IOException;
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import org.jboss.marshalling.Creator;
-import org.jboss.marshalling.Externalizer;
-import org.jboss.remoting.spi.RequestHandlerSource;
-
-/**
- *
- */
-final class ClientSourceExternalizer implements Externalizer {
-
- private static final long serialVersionUID = 814228455390899997L;
-
- private final EndpointImpl endpoint;
-
- ClientSourceExternalizer(final EndpointImpl endpoint) {
- this.endpoint = endpoint;
- }
-
- private static <I, O> void doWriteExternal(final ClientSourceImpl<I, O> clientSource, final ObjectOutput output) throws IOException {
- output.writeObject(clientSource.getRequestClass());
- output.writeObject(clientSource.getReplyClass());
- output.writeObject(clientSource.getRequestHandlerSourceHandle().getResource());
- }
-
- public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
- doWriteExternal((ClientSourceImpl<?, ?>) o, output);
- }
-
- private <I, O> ClientSourceImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandlerSource handlerSource) throws IOException {
- return ClientSourceImpl.create(handlerSource.getHandle(), endpoint, requestClass, replyClass);
- }
-
- public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
- final Class<?> requestClass = (Class<?>) input.readObject();
- final Class<?> replyClass = (Class<?>) input.readObject();
- final RequestHandlerSource handlerSource = (RequestHandlerSource) input.readObject();
- return doCreateExternal(requestClass, replyClass, handlerSource);
- }
-
- public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
- // no op
- }
-}
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceExternalizer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.jboss.marshalling.Creator;
+import org.jboss.marshalling.Externalizer;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+
+/**
+ *
+ */
+final class ClientSourceExternalizer implements Externalizer {
+
+ private static final long serialVersionUID = 814228455390899997L;
+
+ private final EndpointImpl endpoint;
+
+ ClientSourceExternalizer(final EndpointImpl endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ private static <I, O> void doWriteExternal(final ClientSourceImpl<I, O> clientSource, final ObjectOutput output) throws IOException {
+ output.writeObject(clientSource.getRequestClass());
+ output.writeObject(clientSource.getReplyClass());
+ output.writeObject(clientSource.getRequestHandlerSourceHandle().getResource());
+ }
+
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ doWriteExternal((ClientSourceImpl<?, ?>) o, output);
+ }
+
+ private <I, O> ClientSourceImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandlerSource handlerSource) throws IOException {
+ return ClientSourceImpl.create(handlerSource.getHandle(), endpoint, requestClass, replyClass);
+ }
+
+ public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final Class<?> requestClass = (Class<?>) input.readObject();
+ final Class<?> replyClass = (Class<?>) input.readObject();
+ final RequestHandlerSource handlerSource = (RequestHandlerSource) input.readObject();
+ return doCreateExternal(requestClass, replyClass, handlerSource);
+ }
+
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // no op
+ }
+}
\ No newline at end of file
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.spi.AbstractHandleableCloseable;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class ClientSourceImpl<I, O> extends AbstractHandleableCloseable<ClientSource<I, O>> implements ClientSource<I, O> {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.client-source");
-
- private final Handle<RequestHandlerSource> handle;
- private final Endpoint endpoint;
- private final Class<I> requestClass;
- private final Class<O> replyClass;
-
- private ClientSourceImpl(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
- super(endpoint.getExecutor());
- this.handle = handle;
- this.endpoint = endpoint;
- this.requestClass = requestClass;
- this.replyClass = replyClass;
- }
-
- static <I, O> ClientSourceImpl<I, O> create(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
- final ClientSourceImpl<I, O> csi = new ClientSourceImpl<I, O>(handle, endpoint, requestClass, replyClass);
- handle.addCloseHandler(new CloseHandler<Handle<RequestHandlerSource>>() {
- public void handleClose(final Handle<RequestHandlerSource> closed) {
- IoUtils.safeClose(csi);
- }
- });
- return csi;
- }
-
- protected void closeAction() throws IOException {
- handle.close();
- }
-
- public Client<I, O> createClient() throws IOException {
- if (! isOpen()) {
- throw new IOException("Client source is not open");
- }
- final Handle<RequestHandler> clientHandle = handle.getResource().createRequestHandler();
- try {
- return endpoint.createClient(clientHandle.getResource(), requestClass, replyClass);
- } finally {
- IoUtils.safeClose(clientHandle);
- }
- }
-
- public String toString() {
- return "client source instance <" + Integer.toString(hashCode()) + ">";
- }
-
- Handle<RequestHandlerSource> getRequestHandlerSourceHandle() {
- return handle;
- }
-
- Class<I> getRequestClass() {
- return requestClass;
- }
-
- Class<O> getReplyClass() {
- return replyClass;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ClientSourceImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+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;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ClientSourceImpl<I, O> extends AbstractHandleableCloseable<ClientSource<I, O>> implements ClientSource<I, O> {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client-source");
+
+ private final Handle<RequestHandlerSource> handle;
+ private final Endpoint endpoint;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private ClientSourceImpl(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
+ super(endpoint.getExecutor());
+ this.handle = handle;
+ this.endpoint = endpoint;
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ static <I, O> ClientSourceImpl<I, O> create(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
+ final ClientSourceImpl<I, O> csi = new ClientSourceImpl<I, O>(handle, endpoint, requestClass, replyClass);
+ handle.addCloseHandler(new CloseHandler<Handle<RequestHandlerSource>>() {
+ public void handleClose(final Handle<RequestHandlerSource> closed) {
+ IoUtils.safeClose(csi);
+ }
+ });
+ return csi;
+ }
+
+ protected void closeAction() throws IOException {
+ handle.close();
+ }
+
+ public Client<I, O> createClient() throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client source is not open");
+ }
+ final Handle<RequestHandler> clientHandle = handle.getResource().createRequestHandler();
+ try {
+ return endpoint.createClient(clientHandle.getResource(), requestClass, replyClass);
+ } finally {
+ IoUtils.safeClose(clientHandle);
+ }
+ }
+
+ public String toString() {
+ return "client source instance <" + Integer.toString(hashCode()) + ">";
+ }
+
+ Handle<RequestHandlerSource> getRequestHandlerSourceHandle() {
+ return handle;
+ }
+
+ Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ Class<O> getReplyClass() {
+ return replyClass;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,18 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * A handler which is notified of a resource close.
- *
- * @param <T> the type of resource
- *
- * @apiviz.exclude
- */
-public interface CloseHandler<T> {
-
- /**
- * Receive a notification that the resource was closed.
- *
- * @param closed the closed resource
- */
- void handleClose(T closed);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/CloseHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,18 @@
+package org.jboss.remoting3;
+
+/**
+ * A handler which is notified of a resource close.
+ *
+ * @param <T> the type of resource
+ *
+ * @apiviz.exclude
+ */
+public interface CloseHandler<T> {
+
+ /**
+ * Receive a notification that the resource was closed.
+ *
+ * @param closed the closed resource
+ */
+ void handleClose(T closed);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,1709 +0,0 @@
-/*
- * Written by Doug Lea with assistance from members of JCP JSR-166
- * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
- */
-
-package org.jboss.remoting;
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.ref.Reference;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.util.AbstractCollection;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Collection;
-import java.util.ConcurrentModificationException;
-import java.util.EnumSet;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * An advanced hash table supporting configurable garbage collection semantics
- * of keys and values, optional referential-equality, full concurrency of
- * retrievals, and adjustable expected concurrency for updates.
- *
- * This table is designed around specific advanced use-cases. If there is any
- * doubt whether this table is for you, you most likely should be using
- * {@link java.util.concurrent.ConcurrentHashMap} instead.
- *
- * This table supports strong, weak, and soft keys and values. By default keys
- * are weak, and values are strong. Such a configuration offers similar behavior
- * to {@link java.util.WeakHashMap}, entries of this table are periodically
- * removed once their corresponding keys are no longer referenced outside of
- * this table. In other words, this table will not prevent a key from being
- * discarded by the garbage collector. Once a key has been discarded by the
- * collector, the corresponding entry is no longer visible to this table;
- * however, the entry may occupy space until a future table operation decides to
- * reclaim it. For this reason, summary functions such as <tt>size</tt> and
- * <tt>isEmpty</tt> might return a value greater than the observed number of
- * entries. In order to support a high level of concurrency, stale entries are
- * only reclaimed during blocking (usually mutating) operations.
- *
- * Enabling soft keys allows entries in this table to remain until their space
- * is absolutely needed by the garbage collector. This is unlike weak keys which
- * can be reclaimed as soon as they are no longer referenced by a normal strong
- * reference. The primary use case for soft keys is a cache, which ideally
- * occupies memory that is not in use for as long as possible.
- *
- * By default, values are held using a normal strong reference. This provides
- * the commonly desired guarantee that a value will always have at least the
- * same life-span as it's key. For this reason, care should be taken to ensure
- * that a value never refers, either directly or indirectly, to its key, thereby
- * preventing reclamation. If this is unavoidable, then it is recommended to use
- * the same reference type in use for the key. However, it should be noted that
- * non-strong values may disappear before their corresponding key.
- *
- * While this table does allow the use of both strong keys and values, it is
- * recommended to use {@link java.util.concurrent.ConcurrentHashMap} for such a
- * configuration, since it is optimized for that case.
- *
- * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
- * the same functional specification as {@link java.util.Hashtable}, and
- * includes versions of methods corresponding to each method of
- * <tt>Hashtable</tt>. However, even though all operations are thread-safe,
- * retrieval operations do <em>not</em> entail locking, and there is
- * <em>not</em> any support for locking the entire table in a way that
- * prevents all access. This class is fully interoperable with
- * <tt>Hashtable</tt> in programs that rely on its thread safety but not on
- * its synchronization details.
- *
- * <p>
- * Retrieval operations (including <tt>get</tt>) generally do not block, so
- * may overlap with update operations (including <tt>put</tt> and
- * <tt>remove</tt>). Retrievals reflect the results of the most recently
- * <em>completed</em> update operations holding upon their onset. For
- * aggregate operations such as <tt>putAll</tt> and <tt>clear</tt>,
- * concurrent retrievals may reflect insertion or removal of only some entries.
- * Similarly, Iterators and Enumerations return elements reflecting the state of
- * the hash table at some point at or since the creation of the
- * iterator/enumeration. They do <em>not</em> throw
- * {@link ConcurrentModificationException}. However, iterators are designed to
- * be used by only one thread at a time.
- *
- * <p>
- * The allowed concurrency among update operations is guided by the optional
- * <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>),
- * which is used as a hint for internal sizing. The table is internally
- * partitioned to try to permit the indicated number of concurrent updates
- * without contention. Because placement in hash tables is essentially random,
- * the actual concurrency will vary. Ideally, you should choose a value to
- * accommodate as many threads as will ever concurrently modify the table. Using
- * a significantly higher value than you need can waste space and time, and a
- * significantly lower value can lead to thread contention. But overestimates
- * and underestimates within an order of magnitude do not usually have much
- * noticeable impact. A value of one is appropriate when it is known that only
- * one thread will modify and all others will only read. Also, resizing this or
- * any other kind of hash table is a relatively slow operation, so, when
- * possible, it is a good idea to provide estimates of expected table sizes in
- * constructors.
- *
- * <p>
- * This class and its views and iterators implement all of the <em>optional</em>
- * methods of the {@link Map} and {@link Iterator} interfaces.
- *
- * <p>
- * Like {@link Hashtable} but unlike {@link HashMap}, this class does
- * <em>not</em> allow <tt>null</tt> to be used as a key or value.
- *
- * <p>
- * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
- * Java Collections Framework</a>.
- *
- * @author Doug Lea
- * @author Jason T. Greene
- * @param <K> the type of keys maintained by this map
- * @param <V> the type of mapped values
- */
-class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
- implements java.util.concurrent.ConcurrentMap<K, V>, Serializable {
- private static final long serialVersionUID = 7249069246763182397L;
-
- /*
- * The basic strategy is to subdivide the table among Segments,
- * each of which itself is a concurrently readable hash table.
- */
-
- /**
- * An option specifying which Java reference type should be used to refer
- * to a key and/or value.
- */
- public static enum ReferenceType {
- /** Indicates a normal Java strong reference should be used */
- STRONG,
- /** Indicates a {@link WeakReference} should be used */
- WEAK,
- /** Indicates a {@link SoftReference} should be used */
- SOFT
- };
-
-
- public static enum Option {
- /** Indicates that referential-equality (== instead of .equals()) should
- * be used when locating keys. This offers similar behavior to {@link IdentityHashMap} */
- IDENTITY_COMPARISONS
- };
-
- /* ---------------- Constants -------------- */
-
- static final ReferenceType DEFAULT_KEY_TYPE = ReferenceType.WEAK;
-
- static final ReferenceType DEFAULT_VALUE_TYPE = ReferenceType.STRONG;
-
-
- /**
- * The default initial capacity for this table,
- * used when not otherwise specified in a constructor.
- */
- static final int DEFAULT_INITIAL_CAPACITY = 16;
-
- /**
- * The default load factor for this table, used when not
- * otherwise specified in a constructor.
- */
- static final float DEFAULT_LOAD_FACTOR = 0.75f;
-
- /**
- * The default concurrency level for this table, used when not
- * otherwise specified in a constructor.
- */
- static final int DEFAULT_CONCURRENCY_LEVEL = 16;
-
- /**
- * The maximum capacity, used if a higher value is implicitly
- * specified by either of the constructors with arguments. MUST
- * be a power of two <= 1<<30 to ensure that entries are indexable
- * using ints.
- */
- static final int MAXIMUM_CAPACITY = 1 << 30;
-
- /**
- * The maximum number of segments to allow; used to bound
- * constructor arguments.
- */
- static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
-
- /**
- * Number of unsynchronized retries in size and containsValue
- * methods before resorting to locking. This is used to avoid
- * unbounded retries if tables undergo continuous modification
- * which would make it impossible to obtain an accurate result.
- */
- static final int RETRIES_BEFORE_LOCK = 2;
-
- /* ---------------- Fields -------------- */
-
- /**
- * Mask value for indexing into segments. The upper bits of a
- * key's hash code are used to choose the segment.
- */
- final int segmentMask;
-
- /**
- * Shift value for indexing within segments.
- */
- final int segmentShift;
-
- /**
- * The segments, each of which is a specialized hash table
- */
- final Segment<K,V>[] segments;
-
- boolean identityComparisons;
-
- transient Set<K> keySet;
- transient Set<Map.Entry<K,V>> entrySet;
- transient Collection<V> values;
-
- /* ---------------- Small Utilities -------------- */
-
- /**
- * Applies a supplemental hash function to a given hashCode, which
- * defends against poor quality hash functions. This is critical
- * because ConcurrentReferenceHashMap uses power-of-two length hash tables,
- * that otherwise encounter collisions for hashCodes that do not
- * differ in lower or upper bits.
- */
- private static int hash(int h) {
- // Spread bits to regularize both segment and index locations,
- // using variant of single-word Wang/Jenkins hash.
- h += (h << 15) ^ 0xffffcd7d;
- h ^= (h >>> 10);
- h += (h << 3);
- h ^= (h >>> 6);
- h += (h << 2) + (h << 14);
- return h ^ (h >>> 16);
- }
-
- /**
- * Returns the segment that should be used for key with given hash
- * @param hash the hash code for the key
- * @return the segment
- */
- final Segment<K,V> segmentFor(int hash) {
- return segments[(hash >>> segmentShift) & segmentMask];
- }
-
- private int hashOf(Object key) {
- return hash(identityComparisons ?
- System.identityHashCode(key) : key.hashCode());
- }
-
- /* ---------------- Inner Classes -------------- */
-
- static interface KeyReference {
- int keyHash();
- Object keyRef();
- }
-
- /**
- * A weak-key reference which stores the key hash needed for reclamation.
- */
- static final class WeakKeyReference<K> extends WeakReference<K> implements KeyReference {
- final int hash;
- WeakKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
- super(key, refQueue);
- this.hash = hash;
- }
- public final int keyHash() {
- return hash;
- }
-
- public final Object keyRef() {
- return this;
- }
- }
-
- /**
- * A soft-key reference which stores the key hash needed for reclamation.
- */
- static final class SoftKeyReference<K> extends SoftReference<K> implements KeyReference {
- final int hash;
- SoftKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
- super(key, refQueue);
- this.hash = hash;
- }
- public final int keyHash() {
- return hash;
- }
-
- public final Object keyRef() {
- return this;
- }
- }
-
- static final class WeakValueReference<V> extends WeakReference<V> implements KeyReference {
- final Object keyRef;
- final int hash;
- WeakValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
- super(value, refQueue);
- this.keyRef = keyRef;
- this.hash = hash;
- }
-
- public final int keyHash() {
- return hash;
- }
-
- public final Object keyRef() {
- return keyRef;
- }
- }
-
- static final class SoftValueReference<V> extends SoftReference<V> implements KeyReference {
- final Object keyRef;
- final int hash;
- SoftValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
- super(value, refQueue);
- this.keyRef = keyRef;
- this.hash = hash;
- }
- public final int keyHash() {
- return hash;
- }
-
- public final Object keyRef() {
- return keyRef;
- }
- }
-
- /**
- * ConcurrentReferenceHashMap list entry. Note that this is never exported
- * out as a user-visible Map.Entry.
- *
- * Because the value field is volatile, not final, it is legal wrt
- * the Java Memory Model for an unsynchronized reader to see null
- * instead of initial value when read via a data race. Although a
- * reordering leading to this is not likely to ever actually
- * occur, the Segment.readValueUnderLock method is used as a
- * backup in case a null (pre-initialized) value is ever seen in
- * an unsynchronized access method.
- */
- static final class HashEntry<K,V> {
- final Object keyRef;
- final int hash;
- volatile Object valueRef;
- final HashEntry<K,V> next;
-
- HashEntry(K key, int hash, HashEntry<K,V> next, V value,
- ReferenceType keyType, ReferenceType valueType,
- ReferenceQueue<Object> refQueue) {
- this.hash = hash;
- this.next = next;
- this.keyRef = newKeyReference(key, keyType, refQueue);
- this.valueRef = newValueReference(value, valueType, refQueue);
- }
-
- final Object newKeyReference(K key, ReferenceType keyType,
- ReferenceQueue<Object> refQueue) {
- if (keyType == ReferenceType.WEAK)
- return new WeakKeyReference<K>(key, hash, refQueue);
- if (keyType == ReferenceType.SOFT)
- return new SoftKeyReference<K>(key, hash, refQueue);
-
- return key;
- }
-
- final Object newValueReference(V value, ReferenceType valueType,
- ReferenceQueue<Object> refQueue) {
- if (valueType == ReferenceType.WEAK)
- return new WeakValueReference<V>(value, keyRef, hash, refQueue);
- if (valueType == ReferenceType.SOFT)
- return new SoftValueReference<V>(value, keyRef, hash, refQueue);
-
- return value;
- }
-
- @SuppressWarnings("unchecked")
- final K key() {
- if (keyRef instanceof Reference)
- return ((Reference<K>)keyRef).get();
-
- return (K) keyRef;
- }
-
- final V value() {
- return dereferenceValue(valueRef);
- }
-
- @SuppressWarnings("unchecked")
- final V dereferenceValue(Object value) {
- if (value instanceof Reference)
- return ((Reference<V>)value).get();
-
- return (V) value;
- }
-
- final void setValue(V value, ReferenceType valueType, ReferenceQueue<Object> refQueue) {
- this.valueRef = newValueReference(value, valueType, refQueue);
- }
-
- @SuppressWarnings("unchecked")
- static final <K,V> HashEntry<K,V>[] newArray(int i) {
- return new HashEntry[i];
- }
- }
-
- /**
- * Segments are specialized versions of hash tables. This
- * subclasses from ReentrantLock opportunistically, just to
- * simplify some locking and avoid separate construction.
- */
- static final class Segment<K,V> extends ReentrantLock implements Serializable {
- /*
- * Segments maintain a table of entry lists that are ALWAYS
- * kept in a consistent state, so can be read without locking.
- * Next fields of nodes are immutable (final). All list
- * additions are performed at the front of each bin. This
- * makes it easy to check changes, and also fast to traverse.
- * When nodes would otherwise be changed, new nodes are
- * created to replace them. This works well for hash tables
- * since the bin lists tend to be short. (The average length
- * is less than two for the default load factor threshold.)
- *
- * Read operations can thus proceed without locking, but rely
- * on selected uses of volatiles to ensure that completed
- * write operations performed by other threads are
- * noticed. For most purposes, the "count" field, tracking the
- * number of elements, serves as that volatile variable
- * ensuring visibility. This is convenient because this field
- * needs to be read in many read operations anyway:
- *
- * - All (unsynchronized) read operations must first read the
- * "count" field, and should not look at table entries if
- * it is 0.
- *
- * - All (synchronized) write operations should write to
- * the "count" field after structurally changing any bin.
- * The operations must not take any action that could even
- * momentarily cause a concurrent read operation to see
- * inconsistent data. This is made easier by the nature of
- * the read operations in Map. For example, no operation
- * can reveal that the table has grown but the threshold
- * has not yet been updated, so there are no atomicity
- * requirements for this with respect to reads.
- *
- * As a guide, all critical volatile reads and writes to the
- * count field are marked in code comments.
- */
-
- private static final long serialVersionUID = 2249069246763182397L;
-
- /**
- * The number of elements in this segment's region.
- */
- transient volatile int count;
-
- /**
- * Number of updates that alter the size of the table. This is
- * used during bulk-read methods to make sure they see a
- * consistent snapshot: If modCounts change during a traversal
- * of segments computing size or checking containsValue, then
- * we might have an inconsistent view of state so (usually)
- * must retry.
- */
- transient int modCount;
-
- /**
- * The table is rehashed when its size exceeds this threshold.
- * (The value of this field is always <tt>(int)(capacity *
- * loadFactor)</tt>.)
- */
- transient int threshold;
-
- /**
- * The per-segment table.
- */
- transient volatile HashEntry<K,V>[] table;
-
- /**
- * The load factor for the hash table. Even though this value
- * is same for all segments, it is replicated to avoid needing
- * links to outer object.
- * @serial
- */
- final float loadFactor;
-
- /**
- * The collected weak-key reference queue for this segment.
- * This should be (re)initialized whenever table is assigned,
- */
- transient volatile ReferenceQueue<Object> refQueue;
-
- final ReferenceType keyType;
-
- final ReferenceType valueType;
-
- final boolean identityComparisons;
-
- Segment(int initialCapacity, float lf, ReferenceType keyType,
- ReferenceType valueType, boolean identityComparisons) {
- loadFactor = lf;
- this.keyType = keyType;
- this.valueType = valueType;
- this.identityComparisons = identityComparisons;
- setTable(HashEntry.<K,V>newArray(initialCapacity));
- }
-
- @SuppressWarnings("unchecked")
- static final <K,V> Segment<K,V>[] newArray(int i) {
- return new Segment[i];
- }
-
- private boolean keyEq(Object src, Object dest) {
- return identityComparisons ? src == dest : src.equals(dest);
- }
-
- /**
- * Sets table to new HashEntry array.
- * Call only while holding lock or in constructor.
- */
- void setTable(HashEntry<K,V>[] newTable) {
- threshold = (int)(newTable.length * loadFactor);
- table = newTable;
- refQueue = new ReferenceQueue<Object>();
- }
-
- /**
- * Returns properly casted first entry of bin for given hash.
- */
- HashEntry<K,V> getFirst(int hash) {
- HashEntry<K,V>[] tab = table;
- return tab[hash & (tab.length - 1)];
- }
-
- HashEntry<K,V> newHashEntry(K key, int hash, HashEntry<K, V> next, V value) {
- return new HashEntry<K,V>(key, hash, next, value, keyType, valueType, refQueue);
- }
-
- /**
- * Reads value field of an entry under lock. Called if value
- * field ever appears to be null. This is possible only if a
- * compiler happens to reorder a HashEntry initialization with
- * its table assignment, which is legal under memory model
- * but is not known to ever occur.
- */
- V readValueUnderLock(HashEntry<K,V> e) {
- lock();
- try {
- removeStale();
- return e.value();
- } finally {
- unlock();
- }
- }
-
- /* Specialized implementations of map methods */
-
- V get(Object key, int hash) {
- if (count != 0) { // read-volatile
- HashEntry<K,V> e = getFirst(hash);
- while (e != null) {
- if (e.hash == hash && keyEq(key, e.key())) {
- Object opaque = e.valueRef;
- if (opaque != null)
- return e.dereferenceValue(opaque);
-
- return readValueUnderLock(e); // recheck
- }
- e = e.next;
- }
- }
- return null;
- }
-
- boolean containsKey(Object key, int hash) {
- if (count != 0) { // read-volatile
- HashEntry<K,V> e = getFirst(hash);
- while (e != null) {
- if (e.hash == hash && keyEq(key, e.key()))
- return true;
- e = e.next;
- }
- }
- return false;
- }
-
- boolean containsValue(Object value) {
- if (count != 0) { // read-volatile
- HashEntry<K,V>[] tab = table;
- int len = tab.length;
- for (int i = 0 ; i < len; i++) {
- for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
- Object opaque = e.valueRef;
- V v;
-
- if (opaque == null)
- v = readValueUnderLock(e); // recheck
- else
- v = e.dereferenceValue(opaque);
-
- if (value.equals(v))
- return true;
- }
- }
- }
- return false;
- }
-
- boolean replace(K key, int hash, V oldValue, V newValue) {
- lock();
- try {
- removeStale();
- HashEntry<K,V> e = getFirst(hash);
- while (e != null && (e.hash != hash || !keyEq(key, e.key())))
- e = e.next;
-
- boolean replaced = false;
- if (e != null && oldValue.equals(e.value())) {
- replaced = true;
- e.setValue(newValue, valueType, refQueue);
- }
- return replaced;
- } finally {
- unlock();
- }
- }
-
- V replace(K key, int hash, V newValue) {
- lock();
- try {
- removeStale();
- HashEntry<K,V> e = getFirst(hash);
- while (e != null && (e.hash != hash || !keyEq(key, e.key())))
- e = e.next;
-
- V oldValue = null;
- if (e != null) {
- oldValue = e.value();
- e.setValue(newValue, valueType, refQueue);
- }
- return oldValue;
- } finally {
- unlock();
- }
- }
-
-
- V put(K key, int hash, V value, boolean onlyIfAbsent) {
- lock();
- try {
- removeStale();
- int c = count;
- if (c++ > threshold) {// ensure capacity
- int reduced = rehash();
- if (reduced > 0) // adjust from possible weak cleanups
- count = (c -= reduced) - 1; // write-volatile
- }
-
- HashEntry<K,V>[] tab = table;
- int index = hash & (tab.length - 1);
- HashEntry<K,V> first = tab[index];
- HashEntry<K,V> e = first;
- while (e != null && (e.hash != hash || !keyEq(key, e.key())))
- e = e.next;
-
- V oldValue;
- if (e != null) {
- oldValue = e.value();
- if (!onlyIfAbsent)
- e.setValue(value, valueType, refQueue);
- }
- else {
- oldValue = null;
- ++modCount;
- tab[index] = newHashEntry(key, hash, first, value);
- count = c; // write-volatile
- }
- return oldValue;
- } finally {
- unlock();
- }
- }
-
- int rehash() {
- HashEntry<K,V>[] oldTable = table;
- int oldCapacity = oldTable.length;
- if (oldCapacity >= MAXIMUM_CAPACITY)
- return 0;
-
- /*
- * Reclassify nodes in each list to new Map. Because we are
- * using power-of-two expansion, the elements from each bin
- * must either stay at same index, or move with a power of two
- * offset. We eliminate unnecessary node creation by catching
- * cases where old nodes can be reused because their next
- * fields won't change. Statistically, at the default
- * threshold, only about one-sixth of them need cloning when
- * a table doubles. The nodes they replace will be garbage
- * collectable as soon as they are no longer referenced by any
- * reader thread that may be in the midst of traversing table
- * right now.
- */
-
- HashEntry<K,V>[] newTable = HashEntry.newArray(oldCapacity<<1);
- threshold = (int)(newTable.length * loadFactor);
- int sizeMask = newTable.length - 1;
- int reduce = 0;
- for (int i = 0; i < oldCapacity ; i++) {
- // We need to guarantee that any existing reads of old Map can
- // proceed. So we cannot yet null out each bin.
- HashEntry<K,V> e = oldTable[i];
-
- if (e != null) {
- HashEntry<K,V> next = e.next;
- int idx = e.hash & sizeMask;
-
- // Single node on list
- if (next == null)
- newTable[idx] = e;
-
- else {
- // Reuse trailing consecutive sequence at same slot
- HashEntry<K,V> lastRun = e;
- int lastIdx = idx;
- for (HashEntry<K,V> last = next;
- last != null;
- last = last.next) {
- int k = last.hash & sizeMask;
- if (k != lastIdx) {
- lastIdx = k;
- lastRun = last;
- }
- }
- newTable[lastIdx] = lastRun;
- // Clone all remaining nodes
- for (HashEntry<K,V> p = e; p != lastRun; p = p.next) {
- // Skip GC'd weak refs
- K key = p.key();
- if (key == null) {
- reduce++;
- continue;
- }
- int k = p.hash & sizeMask;
- HashEntry<K,V> n = newTable[k];
- newTable[k] = newHashEntry(key, p.hash, n, p.value());
- }
- }
- }
- }
- table = newTable;
- return reduce;
- }
-
- /**
- * Remove; match on key only if value null, else match both.
- */
- V remove(Object key, int hash, Object value, boolean refRemove) {
- lock();
- try {
- if (!refRemove)
- removeStale();
- int c = count - 1;
- HashEntry<K,V>[] tab = table;
- int index = hash & (tab.length - 1);
- HashEntry<K,V> first = tab[index];
- HashEntry<K,V> e = first;
- // a ref remove operation compares the Reference instance
- while (e != null && key != e.keyRef
- && (refRemove || hash != e.hash || !keyEq(key, e.key())))
- e = e.next;
-
- V oldValue = null;
- if (e != null) {
- V v = e.value();
- if (value == null || value.equals(v)) {
- oldValue = v;
- // All entries following removed node can stay
- // in list, but all preceding ones need to be
- // cloned.
- ++modCount;
- HashEntry<K,V> newFirst = e.next;
- for (HashEntry<K,V> p = first; p != e; p = p.next) {
- K pKey = p.key();
- if (pKey == null) { // Skip GC'd keys
- c--;
- continue;
- }
-
- newFirst = newHashEntry(pKey, p.hash, newFirst, p.value());
- }
- tab[index] = newFirst;
- count = c; // write-volatile
- }
- }
- return oldValue;
- } finally {
- unlock();
- }
- }
-
- final void removeStale() {
- KeyReference ref;
- while ((ref = (KeyReference) refQueue.poll()) != null) {
- remove(ref.keyRef(), ref.keyHash(), null, true);
- }
- }
-
- void clear() {
- if (count != 0) {
- lock();
- try {
- HashEntry<K,V>[] tab = table;
- for (int i = 0; i < tab.length ; i++)
- tab[i] = null;
- ++modCount;
- // replace the reference queue to avoid unnecessary stale cleanups
- refQueue = new ReferenceQueue<Object>();
- count = 0; // write-volatile
- } finally {
- unlock();
- }
- }
- }
- }
-
-
-
- /* ---------------- Public operations -------------- */
-
- /**
- * Creates a new, empty map with the specified initial
- * capacity, reference types, load factor and concurrency level.
- *
- * Behavioral changing options such as {@link Option#IDENTITY_COMPARISONS}
- * can also be specified.
- *
- * @param initialCapacity the initial capacity. The implementation
- * performs internal sizing to accommodate this many elements.
- * @param loadFactor the load factor threshold, used to control resizing.
- * Resizing may be performed when the average number of elements per
- * bin exceeds this threshold.
- * @param concurrencyLevel the estimated number of concurrently
- * updating threads. The implementation performs internal sizing
- * to try to accommodate this many threads.
- * @param keyType the reference type to use for keys
- * @param valueType the reference type to use for values
- * @param options the behavioral options
- * @throws IllegalArgumentException if the initial capacity is
- * negative or the load factor or concurrencyLevel are
- * nonpositive.
- */
- public ConcurrentReferenceHashMap(int initialCapacity,
- float loadFactor, int concurrencyLevel,
- ReferenceType keyType, ReferenceType valueType,
- EnumSet<Option> options) {
- if (!(loadFactor > 0) || initialCapacity < 0 || concurrencyLevel <= 0)
- throw new IllegalArgumentException();
-
- if (concurrencyLevel > MAX_SEGMENTS)
- concurrencyLevel = MAX_SEGMENTS;
-
- // Find power-of-two sizes best matching arguments
- int sshift = 0;
- int ssize = 1;
- while (ssize < concurrencyLevel) {
- ++sshift;
- ssize <<= 1;
- }
- segmentShift = 32 - sshift;
- segmentMask = ssize - 1;
- this.segments = Segment.newArray(ssize);
-
- if (initialCapacity > MAXIMUM_CAPACITY)
- initialCapacity = MAXIMUM_CAPACITY;
- int c = initialCapacity / ssize;
- if (c * ssize < initialCapacity)
- ++c;
- int cap = 1;
- while (cap < c)
- cap <<= 1;
-
- identityComparisons = options != null && options.contains(Option.IDENTITY_COMPARISONS);
-
- for (int i = 0; i < this.segments.length; ++i)
- this.segments[i] = new Segment<K,V>(cap, loadFactor,
- keyType, valueType, identityComparisons);
- }
-
- /**
- * Creates a new, empty map with the specified initial
- * capacity, load factor and concurrency level.
- *
- * @param initialCapacity the initial capacity. The implementation
- * performs internal sizing to accommodate this many elements.
- * @param loadFactor the load factor threshold, used to control resizing.
- * Resizing may be performed when the average number of elements per
- * bin exceeds this threshold.
- * @param concurrencyLevel the estimated number of concurrently
- * updating threads. The implementation performs internal sizing
- * to try to accommodate this many threads.
- * @throws IllegalArgumentException if the initial capacity is
- * negative or the load factor or concurrencyLevel are
- * nonpositive.
- */
- public ConcurrentReferenceHashMap(int initialCapacity,
- float loadFactor, int concurrencyLevel) {
- this(initialCapacity, loadFactor, concurrencyLevel,
- DEFAULT_KEY_TYPE, DEFAULT_VALUE_TYPE, null);
- }
-
- /**
- * Creates a new, empty map with the specified initial capacity
- * and load factor and with the default reference types (weak keys,
- * strong values), and concurrencyLevel (16).
- *
- * @param initialCapacity The implementation performs internal
- * sizing to accommodate this many elements.
- * @param loadFactor the load factor threshold, used to control resizing.
- * Resizing may be performed when the average number of elements per
- * bin exceeds this threshold.
- * @throws IllegalArgumentException if the initial capacity of
- * elements is negative or the load factor is nonpositive
- *
- * @since 1.6
- */
- public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
- this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);
- }
-
-
- /**
- * Creates a new, empty map with the specified initial capacity,
- * reference types and with default load factor (0.75) and concurrencyLevel (16).
- *
- * @param initialCapacity the initial capacity. The implementation
- * performs internal sizing to accommodate this many elements.
- * @param keyType the reference type to use for keys
- * @param valueType the reference type to use for values
- * @throws IllegalArgumentException if the initial capacity of
- * elements is negative.
- */
- public ConcurrentReferenceHashMap(int initialCapacity,
- ReferenceType keyType, ReferenceType valueType) {
- this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
- keyType, valueType, null);
- }
-
- /**
- * Creates a new, empty map with the specified initial capacity,
- * and with default reference types (weak keys, strong values),
- * load factor (0.75) and concurrencyLevel (16).
- *
- * @param initialCapacity the initial capacity. The implementation
- * performs internal sizing to accommodate this many elements.
- * @throws IllegalArgumentException if the initial capacity of
- * elements is negative.
- */
- public ConcurrentReferenceHashMap(int initialCapacity) {
- this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
- }
-
- /**
- * Creates a new, empty map with a default initial capacity (16),
- * reference types (weak keys, strong values), default
- * load factor (0.75) and concurrencyLevel (16).
- */
- public ConcurrentReferenceHashMap() {
- this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
- }
-
- /**
- * Creates a new map with the same mappings as the given map.
- * The map is created with a capacity of 1.5 times the number
- * of mappings in the given map or 16 (whichever is greater),
- * and a default load factor (0.75) and concurrencyLevel (16).
- *
- * @param m the map
- */
- public ConcurrentReferenceHashMap(Map<? extends K, ? extends V> m) {
- this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
- DEFAULT_INITIAL_CAPACITY),
- DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
- putAll(m);
- }
-
- /**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
- *
- * @return <tt>true</tt> if this map contains no key-value mappings
- */
- public boolean isEmpty() {
- final Segment<K,V>[] segments = this.segments;
- /*
- * We keep track of per-segment modCounts to avoid ABA
- * problems in which an element in one segment was added and
- * in another removed during traversal, in which case the
- * table was never actually empty at any point. Note the
- * similar use of modCounts in the size() and containsValue()
- * methods, which are the only other methods also susceptible
- * to ABA problems.
- */
- int[] mc = new int[segments.length];
- int mcsum = 0;
- for (int i = 0; i < segments.length; ++i) {
- if (segments[i].count != 0)
- return false;
- else
- mcsum += mc[i] = segments[i].modCount;
- }
- // If mcsum happens to be zero, then we know we got a snapshot
- // before any modifications at all were made. This is
- // probably common enough to bother tracking.
- if (mcsum != 0) {
- for (int i = 0; i < segments.length; ++i) {
- if (segments[i].count != 0 ||
- mc[i] != segments[i].modCount)
- return false;
- }
- }
- return true;
- }
-
- /**
- * Returns the number of key-value mappings in this map. If the
- * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
- *
- * @return the number of key-value mappings in this map
- */
- public int size() {
- final Segment<K,V>[] segments = this.segments;
- long sum = 0;
- long check = 0;
- int[] mc = new int[segments.length];
- // Try a few times to get accurate count. On failure due to
- // continuous async changes in table, resort to locking.
- for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
- check = 0;
- sum = 0;
- int mcsum = 0;
- for (int i = 0; i < segments.length; ++i) {
- sum += segments[i].count;
- mcsum += mc[i] = segments[i].modCount;
- }
- if (mcsum != 0) {
- for (int i = 0; i < segments.length; ++i) {
- check += segments[i].count;
- if (mc[i] != segments[i].modCount) {
- check = -1; // force retry
- break;
- }
- }
- }
- if (check == sum)
- break;
- }
- if (check != sum) { // Resort to locking all segments
- sum = 0;
- for (int i = 0; i < segments.length; ++i)
- segments[i].lock();
- for (int i = 0; i < segments.length; ++i)
- sum += segments[i].count;
- for (int i = 0; i < segments.length; ++i)
- segments[i].unlock();
- }
- if (sum > Integer.MAX_VALUE)
- return Integer.MAX_VALUE;
- else
- return (int)sum;
- }
-
- /**
- * Returns the value to which the specified key is mapped,
- * or {@code null} if this map contains no mapping for the key.
- *
- * <p>More formally, if this map contains a mapping from a key
- * {@code k} to a value {@code v} such that {@code key.equals(k)},
- * then this method returns {@code v}; otherwise it returns
- * {@code null}. (There can be at most one such mapping.)
- *
- * @throws NullPointerException if the specified key is null
- */
- public V get(Object key) {
- int hash = hashOf(key);
- return segmentFor(hash).get(key, hash);
- }
-
- /**
- * Tests if the specified object is a key in this table.
- *
- * @param key possible key
- * @return <tt>true</tt> if and only if the specified object
- * is a key in this table, as determined by the
- * <tt>equals</tt> method; <tt>false</tt> otherwise.
- * @throws NullPointerException if the specified key is null
- */
- public boolean containsKey(Object key) {
- int hash = hashOf(key);
- return segmentFor(hash).containsKey(key, hash);
- }
-
- /**
- * Returns <tt>true</tt> if this map maps one or more keys to the
- * specified value. Note: This method requires a full internal
- * traversal of the hash table, and so is much slower than
- * method <tt>containsKey</tt>.
- *
- * @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
- * specified value
- * @throws NullPointerException if the specified value is null
- */
- public boolean containsValue(Object value) {
- if (value == null)
- throw new NullPointerException();
-
- // See explanation of modCount use above
-
- final Segment<K,V>[] segments = this.segments;
- int[] mc = new int[segments.length];
-
- // Try a few times without locking
- for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
- int sum = 0;
- int mcsum = 0;
- for (int i = 0; i < segments.length; ++i) {
- int c = segments[i].count;
- mcsum += mc[i] = segments[i].modCount;
- if (segments[i].containsValue(value))
- return true;
- }
- boolean cleanSweep = true;
- if (mcsum != 0) {
- for (int i = 0; i < segments.length; ++i) {
- int c = segments[i].count;
- if (mc[i] != segments[i].modCount) {
- cleanSweep = false;
- break;
- }
- }
- }
- if (cleanSweep)
- return false;
- }
- // Resort to locking all segments
- for (int i = 0; i < segments.length; ++i)
- segments[i].lock();
- boolean found = false;
- try {
- for (int i = 0; i < segments.length; ++i) {
- if (segments[i].containsValue(value)) {
- found = true;
- break;
- }
- }
- } finally {
- for (int i = 0; i < segments.length; ++i)
- segments[i].unlock();
- }
- return found;
- }
-
- /**
- * Legacy method testing if some key maps into the specified value
- * in this table. This method is identical in functionality to
- * {@link #containsValue}, and exists solely to ensure
- * full compatibility with class {@link java.util.Hashtable},
- * which supported this method prior to introduction of the
- * Java Collections framework.
-
- * @param value a value to search for
- * @return <tt>true</tt> if and only if some key maps to the
- * <tt>value</tt> argument in this table as
- * determined by the <tt>equals</tt> method;
- * <tt>false</tt> otherwise
- * @throws NullPointerException if the specified value is null
- */
- public boolean contains(Object value) {
- return containsValue(value);
- }
-
- /**
- * Maps the specified key to the specified value in this table.
- * Neither the key nor the value can be null.
- *
- * <p> The value can be retrieved by calling the <tt>get</tt> method
- * with a key that is equal to the original key.
- *
- * @param key key with which the specified value is to be associated
- * @param value value to be associated with the specified key
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>
- * @throws NullPointerException if the specified key or value is null
- */
- public V put(K key, V value) {
- if (value == null)
- throw new NullPointerException();
- int hash = hashOf(key);
- return segmentFor(hash).put(key, hash, value, false);
- }
-
- /**
- * {@inheritDoc}
- *
- * @return the previous value associated with the specified key,
- * or <tt>null</tt> if there was no mapping for the key
- * @throws NullPointerException if the specified key or value is null
- */
- public V putIfAbsent(K key, V value) {
- if (value == null)
- throw new NullPointerException();
- int hash = hashOf(key);
- return segmentFor(hash).put(key, hash, value, true);
- }
-
- /**
- * Copies all of the mappings from the specified map to this one.
- * These mappings replace any mappings that this map had for any of the
- * keys currently in the specified map.
- *
- * @param m mappings to be stored in this map
- */
- public void putAll(Map<? extends K, ? extends V> m) {
- for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
- put(e.getKey(), e.getValue());
- }
-
- /**
- * Removes the key (and its corresponding value) from this map.
- * This method does nothing if the key is not in the map.
- *
- * @param key the key that needs to be removed
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>
- * @throws NullPointerException if the specified key is null
- */
- public V remove(Object key) {
- int hash = hashOf(key);
- return segmentFor(hash).remove(key, hash, null, false);
- }
-
- /**
- * {@inheritDoc}
- *
- * @throws NullPointerException if the specified key is null
- */
- public boolean remove(Object key, Object value) {
- int hash = hashOf(key);
- if (value == null)
- return false;
- return segmentFor(hash).remove(key, hash, value, false) != null;
- }
-
- /**
- * {@inheritDoc}
- *
- * @throws NullPointerException if any of the arguments are null
- */
- public boolean replace(K key, V oldValue, V newValue) {
- if (oldValue == null || newValue == null)
- throw new NullPointerException();
- int hash = hashOf(key);
- return segmentFor(hash).replace(key, hash, oldValue, newValue);
- }
-
- /**
- * {@inheritDoc}
- *
- * @return the previous value associated with the specified key,
- * or <tt>null</tt> if there was no mapping for the key
- * @throws NullPointerException if the specified key or value is null
- */
- public V replace(K key, V value) {
- if (value == null)
- throw new NullPointerException();
- int hash = hashOf(key);
- return segmentFor(hash).replace(key, hash, value);
- }
-
- /**
- * Removes all of the mappings from this map.
- */
- public void clear() {
- for (int i = 0; i < segments.length; ++i)
- segments[i].clear();
- }
-
- /**
- * Removes any stale entries whose keys have been finalized. Use of this
- * method is normally not necessary since stale entries are automatically
- * removed lazily, when blocking operations are required. However, there
- * are some cases where this operation should be performed eagerly, such
- * as cleaning up old references to a ClassLoader in a multi-classloader
- * environment.
- *
- * Note: this method will acquire locks, one at a time, across all segments
- * of this table, so if it is to be used, it should be used sparingly.
- */
- public void purgeStaleEntries() {
- for (int i = 0; i < segments.length; ++i)
- segments[i].removeStale();
- }
-
-
- /**
- * Returns a {@link Set} view of the keys contained in this map.
- * The set is backed by the map, so changes to the map are
- * reflected in the set, and vice-versa. The set supports element
- * removal, which removes the corresponding mapping from this map,
- * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or
- * <tt>addAll</tt> operations.
- *
- * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
- * that will never throw {@link ConcurrentModificationException},
- * and guarantees to traverse elements as they existed upon
- * construction of the iterator, and may (but is not guaranteed to)
- * reflect any modifications subsequent to construction.
- */
- public Set<K> keySet() {
- Set<K> ks = keySet;
- return (ks != null) ? ks : (keySet = new KeySet());
- }
-
- /**
- * Returns a {@link Collection} view of the values contained in this map.
- * The collection is backed by the map, so changes to the map are
- * reflected in the collection, and vice-versa. The collection
- * supports element removal, which removes the corresponding
- * mapping from this map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
- *
- * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
- * that will never throw {@link ConcurrentModificationException},
- * and guarantees to traverse elements as they existed upon
- * construction of the iterator, and may (but is not guaranteed to)
- * reflect any modifications subsequent to construction.
- */
- public Collection<V> values() {
- Collection<V> vs = values;
- return (vs != null) ? vs : (values = new Values());
- }
-
- /**
- * Returns a {@link Set} view of the mappings contained in this map.
- * The set is backed by the map, so changes to the map are
- * reflected in the set, and vice-versa. The set supports element
- * removal, which removes the corresponding mapping from the map,
- * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or
- * <tt>addAll</tt> operations.
- *
- * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
- * that will never throw {@link ConcurrentModificationException},
- * and guarantees to traverse elements as they existed upon
- * construction of the iterator, and may (but is not guaranteed to)
- * reflect any modifications subsequent to construction.
- */
- public Set<Map.Entry<K,V>> entrySet() {
- Set<Map.Entry<K,V>> es = entrySet;
- return (es != null) ? es : (entrySet = new EntrySet());
- }
-
- /**
- * Returns an enumeration of the keys in this table.
- *
- * @return an enumeration of the keys in this table
- * @see #keySet()
- */
- public Enumeration<K> keys() {
- return new KeyIterator();
- }
-
- /**
- * Returns an enumeration of the values in this table.
- *
- * @return an enumeration of the values in this table
- * @see #values()
- */
- public Enumeration<V> elements() {
- return new ValueIterator();
- }
-
- /* ---------------- Iterator Support -------------- */
-
- abstract class HashIterator {
- int nextSegmentIndex;
- int nextTableIndex;
- HashEntry<K,V>[] currentTable;
- HashEntry<K, V> nextEntry;
- HashEntry<K, V> lastReturned;
- K currentKey; // Strong reference to weak key (prevents gc)
-
- HashIterator() {
- nextSegmentIndex = segments.length - 1;
- nextTableIndex = -1;
- advance();
- }
-
- public boolean hasMoreElements() { return hasNext(); }
-
- final void advance() {
- if (nextEntry != null && (nextEntry = nextEntry.next) != null)
- return;
-
- while (nextTableIndex >= 0) {
- if ( (nextEntry = currentTable[nextTableIndex--]) != null)
- return;
- }
-
- while (nextSegmentIndex >= 0) {
- Segment<K,V> seg = segments[nextSegmentIndex--];
- if (seg.count != 0) {
- currentTable = seg.table;
- for (int j = currentTable.length - 1; j >= 0; --j) {
- if ( (nextEntry = currentTable[j]) != null) {
- nextTableIndex = j - 1;
- return;
- }
- }
- }
- }
- }
-
- public boolean hasNext() {
- while (nextEntry != null) {
- if (nextEntry.key() != null)
- return true;
- advance();
- }
-
- return false;
- }
-
- HashEntry<K,V> nextEntry() {
- do {
- if (nextEntry == null)
- throw new NoSuchElementException();
-
- lastReturned = nextEntry;
- currentKey = lastReturned.key();
- advance();
- } while (currentKey == null); // Skip GC'd keys
-
- return lastReturned;
- }
-
- public void remove() {
- if (lastReturned == null)
- throw new IllegalStateException();
- ConcurrentReferenceHashMap.this.remove(currentKey);
- lastReturned = null;
- }
- }
-
- final class KeyIterator
- extends HashIterator
- implements Iterator<K>, Enumeration<K>
- {
- public K next() { return super.nextEntry().key(); }
- public K nextElement() { return super.nextEntry().key(); }
- }
-
- final class ValueIterator
- extends HashIterator
- implements Iterator<V>, Enumeration<V>
- {
- public V next() { return super.nextEntry().value(); }
- public V nextElement() { return super.nextEntry().value(); }
- }
-
- /*
- * This class is needed for JDK5 compatibility.
- */
- static class SimpleEntry<K, V> implements Entry<K, V>,
- java.io.Serializable {
- private static final long serialVersionUID = -8499721149061103585L;
-
- private final K key;
- private V value;
-
- public SimpleEntry(K key, V value) {
- this.key = key;
- this.value = value;
- }
-
- public SimpleEntry(Entry<? extends K, ? extends V> entry) {
- this.key = entry.getKey();
- this.value = entry.getValue();
- }
-
- public K getKey() {
- return key;
- }
-
- public V getValue() {
- return value;
- }
-
- public V setValue(V value) {
- V oldValue = this.value;
- this.value = value;
- return oldValue;
- }
-
- public boolean equals(Object o) {
- if (!(o instanceof Map.Entry))
- return false;
- @SuppressWarnings("unchecked")
- Map.Entry e = (Map.Entry) o;
- return eq(key, e.getKey()) && eq(value, e.getValue());
- }
-
- public int hashCode() {
- return (key == null ? 0 : key.hashCode())
- ^ (value == null ? 0 : value.hashCode());
- }
-
- public String toString() {
- return key + "=" + value;
- }
-
- private static boolean eq(Object o1, Object o2) {
- return o1 == null ? o2 == null : o1.equals(o2);
- }
- }
-
-
- /**
- * Custom Entry class used by EntryIterator.next(), that relays setValue
- * changes to the underlying map.
- */
- final class WriteThroughEntry extends SimpleEntry<K,V>
- {
- private static final long serialVersionUID = -7900634345345313646L;
-
- WriteThroughEntry(K k, V v) {
- super(k,v);
- }
-
- /**
- * Set our entry's value and write through to the map. The
- * value to return is somewhat arbitrary here. Since a
- * WriteThroughEntry does not necessarily track asynchronous
- * changes, the most recent "previous" value could be
- * different from what we return (or could even have been
- * removed in which case the put will re-establish). We do not
- * and cannot guarantee more.
- */
- public V setValue(V value) {
- if (value == null) throw new NullPointerException();
- V v = super.setValue(value);
- ConcurrentReferenceHashMap.this.put(getKey(), value);
- return v;
- }
- }
-
- final class EntryIterator
- extends HashIterator
- implements Iterator<Entry<K,V>>
- {
- public Map.Entry<K,V> next() {
- HashEntry<K,V> e = super.nextEntry();
- return new WriteThroughEntry(e.key(), e.value());
- }
- }
-
- final class KeySet extends AbstractSet<K> {
- public Iterator<K> iterator() {
- return new KeyIterator();
- }
- public int size() {
- return ConcurrentReferenceHashMap.this.size();
- }
- public boolean isEmpty() {
- return ConcurrentReferenceHashMap.this.isEmpty();
- }
- public boolean contains(Object o) {
- return ConcurrentReferenceHashMap.this.containsKey(o);
- }
- public boolean remove(Object o) {
- return ConcurrentReferenceHashMap.this.remove(o) != null;
- }
- public void clear() {
- ConcurrentReferenceHashMap.this.clear();
- }
- }
-
- final class Values extends AbstractCollection<V> {
- public Iterator<V> iterator() {
- return new ValueIterator();
- }
- public int size() {
- return ConcurrentReferenceHashMap.this.size();
- }
- public boolean isEmpty() {
- return ConcurrentReferenceHashMap.this.isEmpty();
- }
- public boolean contains(Object o) {
- return ConcurrentReferenceHashMap.this.containsValue(o);
- }
- public void clear() {
- ConcurrentReferenceHashMap.this.clear();
- }
- }
-
- final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
- public Iterator<Map.Entry<K,V>> iterator() {
- return new EntryIterator();
- }
- public boolean contains(Object o) {
- if (!(o instanceof Map.Entry))
- return false;
- Map.Entry<?,?> e = (Map.Entry<?,?>)o;
- V v = ConcurrentReferenceHashMap.this.get(e.getKey());
- return v != null && v.equals(e.getValue());
- }
- public boolean remove(Object o) {
- if (!(o instanceof Map.Entry))
- return false;
- Map.Entry<?,?> e = (Map.Entry<?,?>)o;
- return ConcurrentReferenceHashMap.this.remove(e.getKey(), e.getValue());
- }
- public int size() {
- return ConcurrentReferenceHashMap.this.size();
- }
- public boolean isEmpty() {
- return ConcurrentReferenceHashMap.this.isEmpty();
- }
- public void clear() {
- ConcurrentReferenceHashMap.this.clear();
- }
- }
-
- /* ---------------- Serialization Support -------------- */
-
- /**
- * Save the state of the <tt>ConcurrentReferenceHashMap</tt> instance to a
- * stream (i.e., serialize it).
- * @param s the stream
- * @serialData
- * the key (Object) and value (Object)
- * for each key-value mapping, followed by a null pair.
- * The key-value mappings are emitted in no particular order.
- */
- private void writeObject(java.io.ObjectOutputStream s) throws IOException {
- s.defaultWriteObject();
-
- for (int k = 0; k < segments.length; ++k) {
- Segment<K,V> seg = segments[k];
- seg.lock();
- try {
- HashEntry<K,V>[] tab = seg.table;
- for (int i = 0; i < tab.length; ++i) {
- for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
- K key = e.key();
- if (key == null) // Skip GC'd keys
- continue;
-
- s.writeObject(key);
- s.writeObject(e.value());
- }
- }
- } finally {
- seg.unlock();
- }
- }
- s.writeObject(null);
- s.writeObject(null);
- }
-
- /**
- * Reconstitute the <tt>ConcurrentReferenceHashMap</tt> instance from a
- * stream (i.e., deserialize it).
- * @param s the stream
- */
- @SuppressWarnings("unchecked")
- private void readObject(java.io.ObjectInputStream s)
- throws IOException, ClassNotFoundException {
- s.defaultReadObject();
-
- // Initialize each segment to be minimally sized, and let grow.
- for (int i = 0; i < segments.length; ++i) {
- segments[i].setTable(new HashEntry[1]);
- }
-
- // Read the keys and values, and put the mappings in the table
- for (;;) {
- K key = (K) s.readObject();
- V value = (V) s.readObject();
- if (key == null)
- break;
- put(key, value);
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ConcurrentReferenceHashMap.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,1709 @@
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ */
+
+package org.jboss.remoting3;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * An advanced hash table supporting configurable garbage collection semantics
+ * of keys and values, optional referential-equality, full concurrency of
+ * retrievals, and adjustable expected concurrency for updates.
+ *
+ * This table is designed around specific advanced use-cases. If there is any
+ * doubt whether this table is for you, you most likely should be using
+ * {@link java.util.concurrent.ConcurrentHashMap} instead.
+ *
+ * This table supports strong, weak, and soft keys and values. By default keys
+ * are weak, and values are strong. Such a configuration offers similar behavior
+ * to {@link java.util.WeakHashMap}, entries of this table are periodically
+ * removed once their corresponding keys are no longer referenced outside of
+ * this table. In other words, this table will not prevent a key from being
+ * discarded by the garbage collector. Once a key has been discarded by the
+ * collector, the corresponding entry is no longer visible to this table;
+ * however, the entry may occupy space until a future table operation decides to
+ * reclaim it. For this reason, summary functions such as <tt>size</tt> and
+ * <tt>isEmpty</tt> might return a value greater than the observed number of
+ * entries. In order to support a high level of concurrency, stale entries are
+ * only reclaimed during blocking (usually mutating) operations.
+ *
+ * Enabling soft keys allows entries in this table to remain until their space
+ * is absolutely needed by the garbage collector. This is unlike weak keys which
+ * can be reclaimed as soon as they are no longer referenced by a normal strong
+ * reference. The primary use case for soft keys is a cache, which ideally
+ * occupies memory that is not in use for as long as possible.
+ *
+ * By default, values are held using a normal strong reference. This provides
+ * the commonly desired guarantee that a value will always have at least the
+ * same life-span as it's key. For this reason, care should be taken to ensure
+ * that a value never refers, either directly or indirectly, to its key, thereby
+ * preventing reclamation. If this is unavoidable, then it is recommended to use
+ * the same reference type in use for the key. However, it should be noted that
+ * non-strong values may disappear before their corresponding key.
+ *
+ * While this table does allow the use of both strong keys and values, it is
+ * recommended to use {@link java.util.concurrent.ConcurrentHashMap} for such a
+ * configuration, since it is optimized for that case.
+ *
+ * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
+ * the same functional specification as {@link java.util.Hashtable}, and
+ * includes versions of methods corresponding to each method of
+ * <tt>Hashtable</tt>. However, even though all operations are thread-safe,
+ * retrieval operations do <em>not</em> entail locking, and there is
+ * <em>not</em> any support for locking the entire table in a way that
+ * prevents all access. This class is fully interoperable with
+ * <tt>Hashtable</tt> in programs that rely on its thread safety but not on
+ * its synchronization details.
+ *
+ * <p>
+ * Retrieval operations (including <tt>get</tt>) generally do not block, so
+ * may overlap with update operations (including <tt>put</tt> and
+ * <tt>remove</tt>). Retrievals reflect the results of the most recently
+ * <em>completed</em> update operations holding upon their onset. For
+ * aggregate operations such as <tt>putAll</tt> and <tt>clear</tt>,
+ * concurrent retrievals may reflect insertion or removal of only some entries.
+ * Similarly, Iterators and Enumerations return elements reflecting the state of
+ * the hash table at some point at or since the creation of the
+ * iterator/enumeration. They do <em>not</em> throw
+ * {@link ConcurrentModificationException}. However, iterators are designed to
+ * be used by only one thread at a time.
+ *
+ * <p>
+ * The allowed concurrency among update operations is guided by the optional
+ * <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>),
+ * which is used as a hint for internal sizing. The table is internally
+ * partitioned to try to permit the indicated number of concurrent updates
+ * without contention. Because placement in hash tables is essentially random,
+ * the actual concurrency will vary. Ideally, you should choose a value to
+ * accommodate as many threads as will ever concurrently modify the table. Using
+ * a significantly higher value than you need can waste space and time, and a
+ * significantly lower value can lead to thread contention. But overestimates
+ * and underestimates within an order of magnitude do not usually have much
+ * noticeable impact. A value of one is appropriate when it is known that only
+ * one thread will modify and all others will only read. Also, resizing this or
+ * any other kind of hash table is a relatively slow operation, so, when
+ * possible, it is a good idea to provide estimates of expected table sizes in
+ * constructors.
+ *
+ * <p>
+ * This class and its views and iterators implement all of the <em>optional</em>
+ * methods of the {@link Map} and {@link Iterator} interfaces.
+ *
+ * <p>
+ * Like {@link Hashtable} but unlike {@link HashMap}, this class does
+ * <em>not</em> allow <tt>null</tt> to be used as a key or value.
+ *
+ * <p>
+ * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author Doug Lea
+ * @author Jason T. Greene
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ */
+class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
+ implements java.util.concurrent.ConcurrentMap<K, V>, Serializable {
+ private static final long serialVersionUID = 7249069246763182397L;
+
+ /*
+ * The basic strategy is to subdivide the table among Segments,
+ * each of which itself is a concurrently readable hash table.
+ */
+
+ /**
+ * An option specifying which Java reference type should be used to refer
+ * to a key and/or value.
+ */
+ public static enum ReferenceType {
+ /** Indicates a normal Java strong reference should be used */
+ STRONG,
+ /** Indicates a {@link WeakReference} should be used */
+ WEAK,
+ /** Indicates a {@link SoftReference} should be used */
+ SOFT
+ };
+
+
+ public static enum Option {
+ /** Indicates that referential-equality (== instead of .equals()) should
+ * be used when locating keys. This offers similar behavior to {@link IdentityHashMap} */
+ IDENTITY_COMPARISONS
+ };
+
+ /* ---------------- Constants -------------- */
+
+ static final ReferenceType DEFAULT_KEY_TYPE = ReferenceType.WEAK;
+
+ static final ReferenceType DEFAULT_VALUE_TYPE = ReferenceType.STRONG;
+
+
+ /**
+ * The default initial capacity for this table,
+ * used when not otherwise specified in a constructor.
+ */
+ static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+ /**
+ * The default load factor for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+ /**
+ * The default concurrency level for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+
+ /**
+ * The maximum capacity, used if a higher value is implicitly
+ * specified by either of the constructors with arguments. MUST
+ * be a power of two <= 1<<30 to ensure that entries are indexable
+ * using ints.
+ */
+ static final int MAXIMUM_CAPACITY = 1 << 30;
+
+ /**
+ * The maximum number of segments to allow; used to bound
+ * constructor arguments.
+ */
+ static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
+
+ /**
+ * Number of unsynchronized retries in size and containsValue
+ * methods before resorting to locking. This is used to avoid
+ * unbounded retries if tables undergo continuous modification
+ * which would make it impossible to obtain an accurate result.
+ */
+ static final int RETRIES_BEFORE_LOCK = 2;
+
+ /* ---------------- Fields -------------- */
+
+ /**
+ * Mask value for indexing into segments. The upper bits of a
+ * key's hash code are used to choose the segment.
+ */
+ final int segmentMask;
+
+ /**
+ * Shift value for indexing within segments.
+ */
+ final int segmentShift;
+
+ /**
+ * The segments, each of which is a specialized hash table
+ */
+ final Segment<K,V>[] segments;
+
+ boolean identityComparisons;
+
+ transient Set<K> keySet;
+ transient Set<Map.Entry<K,V>> entrySet;
+ transient Collection<V> values;
+
+ /* ---------------- Small Utilities -------------- */
+
+ /**
+ * Applies a supplemental hash function to a given hashCode, which
+ * defends against poor quality hash functions. This is critical
+ * because ConcurrentReferenceHashMap uses power-of-two length hash tables,
+ * that otherwise encounter collisions for hashCodes that do not
+ * differ in lower or upper bits.
+ */
+ private static int hash(int h) {
+ // Spread bits to regularize both segment and index locations,
+ // using variant of single-word Wang/Jenkins hash.
+ h += (h << 15) ^ 0xffffcd7d;
+ h ^= (h >>> 10);
+ h += (h << 3);
+ h ^= (h >>> 6);
+ h += (h << 2) + (h << 14);
+ return h ^ (h >>> 16);
+ }
+
+ /**
+ * Returns the segment that should be used for key with given hash
+ * @param hash the hash code for the key
+ * @return the segment
+ */
+ final Segment<K,V> segmentFor(int hash) {
+ return segments[(hash >>> segmentShift) & segmentMask];
+ }
+
+ private int hashOf(Object key) {
+ return hash(identityComparisons ?
+ System.identityHashCode(key) : key.hashCode());
+ }
+
+ /* ---------------- Inner Classes -------------- */
+
+ static interface KeyReference {
+ int keyHash();
+ Object keyRef();
+ }
+
+ /**
+ * A weak-key reference which stores the key hash needed for reclamation.
+ */
+ static final class WeakKeyReference<K> extends WeakReference<K> implements KeyReference {
+ final int hash;
+ WeakKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return this;
+ }
+ }
+
+ /**
+ * A soft-key reference which stores the key hash needed for reclamation.
+ */
+ static final class SoftKeyReference<K> extends SoftReference<K> implements KeyReference {
+ final int hash;
+ SoftKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return this;
+ }
+ }
+
+ static final class WeakValueReference<V> extends WeakReference<V> implements KeyReference {
+ final Object keyRef;
+ final int hash;
+ WeakValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
+ super(value, refQueue);
+ this.keyRef = keyRef;
+ this.hash = hash;
+ }
+
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return keyRef;
+ }
+ }
+
+ static final class SoftValueReference<V> extends SoftReference<V> implements KeyReference {
+ final Object keyRef;
+ final int hash;
+ SoftValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
+ super(value, refQueue);
+ this.keyRef = keyRef;
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return keyRef;
+ }
+ }
+
+ /**
+ * ConcurrentReferenceHashMap list entry. Note that this is never exported
+ * out as a user-visible Map.Entry.
+ *
+ * Because the value field is volatile, not final, it is legal wrt
+ * the Java Memory Model for an unsynchronized reader to see null
+ * instead of initial value when read via a data race. Although a
+ * reordering leading to this is not likely to ever actually
+ * occur, the Segment.readValueUnderLock method is used as a
+ * backup in case a null (pre-initialized) value is ever seen in
+ * an unsynchronized access method.
+ */
+ static final class HashEntry<K,V> {
+ final Object keyRef;
+ final int hash;
+ volatile Object valueRef;
+ final HashEntry<K,V> next;
+
+ HashEntry(K key, int hash, HashEntry<K,V> next, V value,
+ ReferenceType keyType, ReferenceType valueType,
+ ReferenceQueue<Object> refQueue) {
+ this.hash = hash;
+ this.next = next;
+ this.keyRef = newKeyReference(key, keyType, refQueue);
+ this.valueRef = newValueReference(value, valueType, refQueue);
+ }
+
+ final Object newKeyReference(K key, ReferenceType keyType,
+ ReferenceQueue<Object> refQueue) {
+ if (keyType == ReferenceType.WEAK)
+ return new WeakKeyReference<K>(key, hash, refQueue);
+ if (keyType == ReferenceType.SOFT)
+ return new SoftKeyReference<K>(key, hash, refQueue);
+
+ return key;
+ }
+
+ final Object newValueReference(V value, ReferenceType valueType,
+ ReferenceQueue<Object> refQueue) {
+ if (valueType == ReferenceType.WEAK)
+ return new WeakValueReference<V>(value, keyRef, hash, refQueue);
+ if (valueType == ReferenceType.SOFT)
+ return new SoftValueReference<V>(value, keyRef, hash, refQueue);
+
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ final K key() {
+ if (keyRef instanceof Reference)
+ return ((Reference<K>)keyRef).get();
+
+ return (K) keyRef;
+ }
+
+ final V value() {
+ return dereferenceValue(valueRef);
+ }
+
+ @SuppressWarnings("unchecked")
+ final V dereferenceValue(Object value) {
+ if (value instanceof Reference)
+ return ((Reference<V>)value).get();
+
+ return (V) value;
+ }
+
+ final void setValue(V value, ReferenceType valueType, ReferenceQueue<Object> refQueue) {
+ this.valueRef = newValueReference(value, valueType, refQueue);
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> HashEntry<K,V>[] newArray(int i) {
+ return new HashEntry[i];
+ }
+ }
+
+ /**
+ * Segments are specialized versions of hash tables. This
+ * subclasses from ReentrantLock opportunistically, just to
+ * simplify some locking and avoid separate construction.
+ */
+ static final class Segment<K,V> extends ReentrantLock implements Serializable {
+ /*
+ * Segments maintain a table of entry lists that are ALWAYS
+ * kept in a consistent state, so can be read without locking.
+ * Next fields of nodes are immutable (final). All list
+ * additions are performed at the front of each bin. This
+ * makes it easy to check changes, and also fast to traverse.
+ * When nodes would otherwise be changed, new nodes are
+ * created to replace them. This works well for hash tables
+ * since the bin lists tend to be short. (The average length
+ * is less than two for the default load factor threshold.)
+ *
+ * Read operations can thus proceed without locking, but rely
+ * on selected uses of volatiles to ensure that completed
+ * write operations performed by other threads are
+ * noticed. For most purposes, the "count" field, tracking the
+ * number of elements, serves as that volatile variable
+ * ensuring visibility. This is convenient because this field
+ * needs to be read in many read operations anyway:
+ *
+ * - All (unsynchronized) read operations must first read the
+ * "count" field, and should not look at table entries if
+ * it is 0.
+ *
+ * - All (synchronized) write operations should write to
+ * the "count" field after structurally changing any bin.
+ * The operations must not take any action that could even
+ * momentarily cause a concurrent read operation to see
+ * inconsistent data. This is made easier by the nature of
+ * the read operations in Map. For example, no operation
+ * can reveal that the table has grown but the threshold
+ * has not yet been updated, so there are no atomicity
+ * requirements for this with respect to reads.
+ *
+ * As a guide, all critical volatile reads and writes to the
+ * count field are marked in code comments.
+ */
+
+ private static final long serialVersionUID = 2249069246763182397L;
+
+ /**
+ * The number of elements in this segment's region.
+ */
+ transient volatile int count;
+
+ /**
+ * Number of updates that alter the size of the table. This is
+ * used during bulk-read methods to make sure they see a
+ * consistent snapshot: If modCounts change during a traversal
+ * of segments computing size or checking containsValue, then
+ * we might have an inconsistent view of state so (usually)
+ * must retry.
+ */
+ transient int modCount;
+
+ /**
+ * The table is rehashed when its size exceeds this threshold.
+ * (The value of this field is always <tt>(int)(capacity *
+ * loadFactor)</tt>.)
+ */
+ transient int threshold;
+
+ /**
+ * The per-segment table.
+ */
+ transient volatile HashEntry<K,V>[] table;
+
+ /**
+ * The load factor for the hash table. Even though this value
+ * is same for all segments, it is replicated to avoid needing
+ * links to outer object.
+ * @serial
+ */
+ final float loadFactor;
+
+ /**
+ * The collected weak-key reference queue for this segment.
+ * This should be (re)initialized whenever table is assigned,
+ */
+ transient volatile ReferenceQueue<Object> refQueue;
+
+ final ReferenceType keyType;
+
+ final ReferenceType valueType;
+
+ final boolean identityComparisons;
+
+ Segment(int initialCapacity, float lf, ReferenceType keyType,
+ ReferenceType valueType, boolean identityComparisons) {
+ loadFactor = lf;
+ this.keyType = keyType;
+ this.valueType = valueType;
+ this.identityComparisons = identityComparisons;
+ setTable(HashEntry.<K,V>newArray(initialCapacity));
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> Segment<K,V>[] newArray(int i) {
+ return new Segment[i];
+ }
+
+ private boolean keyEq(Object src, Object dest) {
+ return identityComparisons ? src == dest : src.equals(dest);
+ }
+
+ /**
+ * Sets table to new HashEntry array.
+ * Call only while holding lock or in constructor.
+ */
+ void setTable(HashEntry<K,V>[] newTable) {
+ threshold = (int)(newTable.length * loadFactor);
+ table = newTable;
+ refQueue = new ReferenceQueue<Object>();
+ }
+
+ /**
+ * Returns properly casted first entry of bin for given hash.
+ */
+ HashEntry<K,V> getFirst(int hash) {
+ HashEntry<K,V>[] tab = table;
+ return tab[hash & (tab.length - 1)];
+ }
+
+ HashEntry<K,V> newHashEntry(K key, int hash, HashEntry<K, V> next, V value) {
+ return new HashEntry<K,V>(key, hash, next, value, keyType, valueType, refQueue);
+ }
+
+ /**
+ * Reads value field of an entry under lock. Called if value
+ * field ever appears to be null. This is possible only if a
+ * compiler happens to reorder a HashEntry initialization with
+ * its table assignment, which is legal under memory model
+ * but is not known to ever occur.
+ */
+ V readValueUnderLock(HashEntry<K,V> e) {
+ lock();
+ try {
+ removeStale();
+ return e.value();
+ } finally {
+ unlock();
+ }
+ }
+
+ /* Specialized implementations of map methods */
+
+ V get(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key())) {
+ Object opaque = e.valueRef;
+ if (opaque != null)
+ return e.dereferenceValue(opaque);
+
+ return readValueUnderLock(e); // recheck
+ }
+ e = e.next;
+ }
+ }
+ return null;
+ }
+
+ boolean containsKey(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key()))
+ return true;
+ e = e.next;
+ }
+ }
+ return false;
+ }
+
+ boolean containsValue(Object value) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V>[] tab = table;
+ int len = tab.length;
+ for (int i = 0 ; i < len; i++) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ Object opaque = e.valueRef;
+ V v;
+
+ if (opaque == null)
+ v = readValueUnderLock(e); // recheck
+ else
+ v = e.dereferenceValue(opaque);
+
+ if (value.equals(v))
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ boolean replace(K key, int hash, V oldValue, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ boolean replaced = false;
+ if (e != null && oldValue.equals(e.value())) {
+ replaced = true;
+ e.setValue(newValue, valueType, refQueue);
+ }
+ return replaced;
+ } finally {
+ unlock();
+ }
+ }
+
+ V replace(K key, int hash, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ oldValue = e.value();
+ e.setValue(newValue, valueType, refQueue);
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+
+ V put(K key, int hash, V value, boolean onlyIfAbsent) {
+ lock();
+ try {
+ removeStale();
+ int c = count;
+ if (c++ > threshold) {// ensure capacity
+ int reduced = rehash();
+ if (reduced > 0) // adjust from possible weak cleanups
+ count = (c -= reduced) - 1; // write-volatile
+ }
+
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue;
+ if (e != null) {
+ oldValue = e.value();
+ if (!onlyIfAbsent)
+ e.setValue(value, valueType, refQueue);
+ }
+ else {
+ oldValue = null;
+ ++modCount;
+ tab[index] = newHashEntry(key, hash, first, value);
+ count = c; // write-volatile
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ int rehash() {
+ HashEntry<K,V>[] oldTable = table;
+ int oldCapacity = oldTable.length;
+ if (oldCapacity >= MAXIMUM_CAPACITY)
+ return 0;
+
+ /*
+ * Reclassify nodes in each list to new Map. Because we are
+ * using power-of-two expansion, the elements from each bin
+ * must either stay at same index, or move with a power of two
+ * offset. We eliminate unnecessary node creation by catching
+ * cases where old nodes can be reused because their next
+ * fields won't change. Statistically, at the default
+ * threshold, only about one-sixth of them need cloning when
+ * a table doubles. The nodes they replace will be garbage
+ * collectable as soon as they are no longer referenced by any
+ * reader thread that may be in the midst of traversing table
+ * right now.
+ */
+
+ HashEntry<K,V>[] newTable = HashEntry.newArray(oldCapacity<<1);
+ threshold = (int)(newTable.length * loadFactor);
+ int sizeMask = newTable.length - 1;
+ int reduce = 0;
+ for (int i = 0; i < oldCapacity ; i++) {
+ // We need to guarantee that any existing reads of old Map can
+ // proceed. So we cannot yet null out each bin.
+ HashEntry<K,V> e = oldTable[i];
+
+ if (e != null) {
+ HashEntry<K,V> next = e.next;
+ int idx = e.hash & sizeMask;
+
+ // Single node on list
+ if (next == null)
+ newTable[idx] = e;
+
+ else {
+ // Reuse trailing consecutive sequence at same slot
+ HashEntry<K,V> lastRun = e;
+ int lastIdx = idx;
+ for (HashEntry<K,V> last = next;
+ last != null;
+ last = last.next) {
+ int k = last.hash & sizeMask;
+ if (k != lastIdx) {
+ lastIdx = k;
+ lastRun = last;
+ }
+ }
+ newTable[lastIdx] = lastRun;
+ // Clone all remaining nodes
+ for (HashEntry<K,V> p = e; p != lastRun; p = p.next) {
+ // Skip GC'd weak refs
+ K key = p.key();
+ if (key == null) {
+ reduce++;
+ continue;
+ }
+ int k = p.hash & sizeMask;
+ HashEntry<K,V> n = newTable[k];
+ newTable[k] = newHashEntry(key, p.hash, n, p.value());
+ }
+ }
+ }
+ }
+ table = newTable;
+ return reduce;
+ }
+
+ /**
+ * Remove; match on key only if value null, else match both.
+ */
+ V remove(Object key, int hash, Object value, boolean refRemove) {
+ lock();
+ try {
+ if (!refRemove)
+ removeStale();
+ int c = count - 1;
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ // a ref remove operation compares the Reference instance
+ while (e != null && key != e.keyRef
+ && (refRemove || hash != e.hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ V v = e.value();
+ if (value == null || value.equals(v)) {
+ oldValue = v;
+ // All entries following removed node can stay
+ // in list, but all preceding ones need to be
+ // cloned.
+ ++modCount;
+ HashEntry<K,V> newFirst = e.next;
+ for (HashEntry<K,V> p = first; p != e; p = p.next) {
+ K pKey = p.key();
+ if (pKey == null) { // Skip GC'd keys
+ c--;
+ continue;
+ }
+
+ newFirst = newHashEntry(pKey, p.hash, newFirst, p.value());
+ }
+ tab[index] = newFirst;
+ count = c; // write-volatile
+ }
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ final void removeStale() {
+ KeyReference ref;
+ while ((ref = (KeyReference) refQueue.poll()) != null) {
+ remove(ref.keyRef(), ref.keyHash(), null, true);
+ }
+ }
+
+ void clear() {
+ if (count != 0) {
+ lock();
+ try {
+ HashEntry<K,V>[] tab = table;
+ for (int i = 0; i < tab.length ; i++)
+ tab[i] = null;
+ ++modCount;
+ // replace the reference queue to avoid unnecessary stale cleanups
+ refQueue = new ReferenceQueue<Object>();
+ count = 0; // write-volatile
+ } finally {
+ unlock();
+ }
+ }
+ }
+ }
+
+
+
+ /* ---------------- Public operations -------------- */
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, reference types, load factor and concurrency level.
+ *
+ * Behavioral changing options such as {@link Option#IDENTITY_COMPARISONS}
+ * can also be specified.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @param options the behavioral options
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel,
+ ReferenceType keyType, ReferenceType valueType,
+ EnumSet<Option> options) {
+ if (!(loadFactor > 0) || initialCapacity < 0 || concurrencyLevel <= 0)
+ throw new IllegalArgumentException();
+
+ if (concurrencyLevel > MAX_SEGMENTS)
+ concurrencyLevel = MAX_SEGMENTS;
+
+ // Find power-of-two sizes best matching arguments
+ int sshift = 0;
+ int ssize = 1;
+ while (ssize < concurrencyLevel) {
+ ++sshift;
+ ssize <<= 1;
+ }
+ segmentShift = 32 - sshift;
+ segmentMask = ssize - 1;
+ this.segments = Segment.newArray(ssize);
+
+ if (initialCapacity > MAXIMUM_CAPACITY)
+ initialCapacity = MAXIMUM_CAPACITY;
+ int c = initialCapacity / ssize;
+ if (c * ssize < initialCapacity)
+ ++c;
+ int cap = 1;
+ while (cap < c)
+ cap <<= 1;
+
+ identityComparisons = options != null && options.contains(Option.IDENTITY_COMPARISONS);
+
+ for (int i = 0; i < this.segments.length; ++i)
+ this.segments[i] = new Segment<K,V>(cap, loadFactor,
+ keyType, valueType, identityComparisons);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, load factor and concurrency level.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel) {
+ this(initialCapacity, loadFactor, concurrencyLevel,
+ DEFAULT_KEY_TYPE, DEFAULT_VALUE_TYPE, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity
+ * and load factor and with the default reference types (weak keys,
+ * strong values), and concurrencyLevel (16).
+ *
+ * @param initialCapacity The implementation performs internal
+ * sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative or the load factor is nonpositive
+ *
+ * @since 1.6
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
+ this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * reference types and with default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ ReferenceType keyType, ReferenceType valueType) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
+ keyType, valueType, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * and with default reference types (weak keys, strong values),
+ * load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new, empty map with a default initial capacity (16),
+ * reference types (weak keys, strong values), default
+ * load factor (0.75) and concurrencyLevel (16).
+ */
+ public ConcurrentReferenceHashMap() {
+ this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new map with the same mappings as the given map.
+ * The map is created with a capacity of 1.5 times the number
+ * of mappings in the given map or 16 (whichever is greater),
+ * and a default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param m the map
+ */
+ public ConcurrentReferenceHashMap(Map<? extends K, ? extends V> m) {
+ this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
+ DEFAULT_INITIAL_CAPACITY),
+ DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ putAll(m);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map contains no key-value mappings.
+ *
+ * @return <tt>true</tt> if this map contains no key-value mappings
+ */
+ public boolean isEmpty() {
+ final Segment<K,V>[] segments = this.segments;
+ /*
+ * We keep track of per-segment modCounts to avoid ABA
+ * problems in which an element in one segment was added and
+ * in another removed during traversal, in which case the
+ * table was never actually empty at any point. Note the
+ * similar use of modCounts in the size() and containsValue()
+ * methods, which are the only other methods also susceptible
+ * to ABA problems.
+ */
+ int[] mc = new int[segments.length];
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0)
+ return false;
+ else
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ // If mcsum happens to be zero, then we know we got a snapshot
+ // before any modifications at all were made. This is
+ // probably common enough to bother tracking.
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0 ||
+ mc[i] != segments[i].modCount)
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns the number of key-value mappings in this map. If the
+ * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+ * <tt>Integer.MAX_VALUE</tt>.
+ *
+ * @return the number of key-value mappings in this map
+ */
+ public int size() {
+ final Segment<K,V>[] segments = this.segments;
+ long sum = 0;
+ long check = 0;
+ int[] mc = new int[segments.length];
+ // Try a few times to get accurate count. On failure due to
+ // continuous async changes in table, resort to locking.
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ check = 0;
+ sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ sum += segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ check += segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ check = -1; // force retry
+ break;
+ }
+ }
+ }
+ if (check == sum)
+ break;
+ }
+ if (check != sum) { // Resort to locking all segments
+ sum = 0;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ for (int i = 0; i < segments.length; ++i)
+ sum += segments[i].count;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ if (sum > Integer.MAX_VALUE)
+ return Integer.MAX_VALUE;
+ else
+ return (int)sum;
+ }
+
+ /**
+ * Returns the value to which the specified key is mapped,
+ * or {@code null} if this map contains no mapping for the key.
+ *
+ * <p>More formally, if this map contains a mapping from a key
+ * {@code k} to a value {@code v} such that {@code key.equals(k)},
+ * then this method returns {@code v}; otherwise it returns
+ * {@code null}. (There can be at most one such mapping.)
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public V get(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).get(key, hash);
+ }
+
+ /**
+ * Tests if the specified object is a key in this table.
+ *
+ * @param key possible key
+ * @return <tt>true</tt> if and only if the specified object
+ * is a key in this table, as determined by the
+ * <tt>equals</tt> method; <tt>false</tt> otherwise.
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean containsKey(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).containsKey(key, hash);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map maps one or more keys to the
+ * specified value. Note: This method requires a full internal
+ * traversal of the hash table, and so is much slower than
+ * method <tt>containsKey</tt>.
+ *
+ * @param value value whose presence in this map is to be tested
+ * @return <tt>true</tt> if this map maps one or more keys to the
+ * specified value
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean containsValue(Object value) {
+ if (value == null)
+ throw new NullPointerException();
+
+ // See explanation of modCount use above
+
+ final Segment<K,V>[] segments = this.segments;
+ int[] mc = new int[segments.length];
+
+ // Try a few times without locking
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ int sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ if (segments[i].containsValue(value))
+ return true;
+ }
+ boolean cleanSweep = true;
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ cleanSweep = false;
+ break;
+ }
+ }
+ }
+ if (cleanSweep)
+ return false;
+ }
+ // Resort to locking all segments
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ boolean found = false;
+ try {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].containsValue(value)) {
+ found = true;
+ break;
+ }
+ }
+ } finally {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ return found;
+ }
+
+ /**
+ * Legacy method testing if some key maps into the specified value
+ * in this table. This method is identical in functionality to
+ * {@link #containsValue}, and exists solely to ensure
+ * full compatibility with class {@link java.util.Hashtable},
+ * which supported this method prior to introduction of the
+ * Java Collections framework.
+
+ * @param value a value to search for
+ * @return <tt>true</tt> if and only if some key maps to the
+ * <tt>value</tt> argument in this table as
+ * determined by the <tt>equals</tt> method;
+ * <tt>false</tt> otherwise
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean contains(Object value) {
+ return containsValue(value);
+ }
+
+ /**
+ * Maps the specified key to the specified value in this table.
+ * Neither the key nor the value can be null.
+ *
+ * <p> The value can be retrieved by calling the <tt>get</tt> method
+ * with a key that is equal to the original key.
+ *
+ * @param key key with which the specified value is to be associated
+ * @param value value to be associated with the specified key
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V put(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V putIfAbsent(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, true);
+ }
+
+ /**
+ * Copies all of the mappings from the specified map to this one.
+ * These mappings replace any mappings that this map had for any of the
+ * keys currently in the specified map.
+ *
+ * @param m mappings to be stored in this map
+ */
+ public void putAll(Map<? extends K, ? extends V> m) {
+ for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+ put(e.getKey(), e.getValue());
+ }
+
+ /**
+ * Removes the key (and its corresponding value) from this map.
+ * This method does nothing if the key is not in the map.
+ *
+ * @param key the key that needs to be removed
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key is null
+ */
+ public V remove(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).remove(key, hash, null, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean remove(Object key, Object value) {
+ int hash = hashOf(key);
+ if (value == null)
+ return false;
+ return segmentFor(hash).remove(key, hash, value, false) != null;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if any of the arguments are null
+ */
+ public boolean replace(K key, V oldValue, V newValue) {
+ if (oldValue == null || newValue == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, oldValue, newValue);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V replace(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, value);
+ }
+
+ /**
+ * Removes all of the mappings from this map.
+ */
+ public void clear() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].clear();
+ }
+
+ /**
+ * Removes any stale entries whose keys have been finalized. Use of this
+ * method is normally not necessary since stale entries are automatically
+ * removed lazily, when blocking operations are required. However, there
+ * are some cases where this operation should be performed eagerly, such
+ * as cleaning up old references to a ClassLoader in a multi-classloader
+ * environment.
+ *
+ * Note: this method will acquire locks, one at a time, across all segments
+ * of this table, so if it is to be used, it should be used sparingly.
+ */
+ public void purgeStaleEntries() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].removeStale();
+ }
+
+
+ /**
+ * Returns a {@link Set} view of the keys contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from this map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<K> keySet() {
+ Set<K> ks = keySet;
+ return (ks != null) ? ks : (keySet = new KeySet());
+ }
+
+ /**
+ * Returns a {@link Collection} view of the values contained in this map.
+ * The collection is backed by the map, so changes to the map are
+ * reflected in the collection, and vice-versa. The collection
+ * supports element removal, which removes the corresponding
+ * mapping from this map, via the <tt>Iterator.remove</tt>,
+ * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+ * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not
+ * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Collection<V> values() {
+ Collection<V> vs = values;
+ return (vs != null) ? vs : (values = new Values());
+ }
+
+ /**
+ * Returns a {@link Set} view of the mappings contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from the map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<Map.Entry<K,V>> entrySet() {
+ Set<Map.Entry<K,V>> es = entrySet;
+ return (es != null) ? es : (entrySet = new EntrySet());
+ }
+
+ /**
+ * Returns an enumeration of the keys in this table.
+ *
+ * @return an enumeration of the keys in this table
+ * @see #keySet()
+ */
+ public Enumeration<K> keys() {
+ return new KeyIterator();
+ }
+
+ /**
+ * Returns an enumeration of the values in this table.
+ *
+ * @return an enumeration of the values in this table
+ * @see #values()
+ */
+ public Enumeration<V> elements() {
+ return new ValueIterator();
+ }
+
+ /* ---------------- Iterator Support -------------- */
+
+ abstract class HashIterator {
+ int nextSegmentIndex;
+ int nextTableIndex;
+ HashEntry<K,V>[] currentTable;
+ HashEntry<K, V> nextEntry;
+ HashEntry<K, V> lastReturned;
+ K currentKey; // Strong reference to weak key (prevents gc)
+
+ HashIterator() {
+ nextSegmentIndex = segments.length - 1;
+ nextTableIndex = -1;
+ advance();
+ }
+
+ public boolean hasMoreElements() { return hasNext(); }
+
+ final void advance() {
+ if (nextEntry != null && (nextEntry = nextEntry.next) != null)
+ return;
+
+ while (nextTableIndex >= 0) {
+ if ( (nextEntry = currentTable[nextTableIndex--]) != null)
+ return;
+ }
+
+ while (nextSegmentIndex >= 0) {
+ Segment<K,V> seg = segments[nextSegmentIndex--];
+ if (seg.count != 0) {
+ currentTable = seg.table;
+ for (int j = currentTable.length - 1; j >= 0; --j) {
+ if ( (nextEntry = currentTable[j]) != null) {
+ nextTableIndex = j - 1;
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ public boolean hasNext() {
+ while (nextEntry != null) {
+ if (nextEntry.key() != null)
+ return true;
+ advance();
+ }
+
+ return false;
+ }
+
+ HashEntry<K,V> nextEntry() {
+ do {
+ if (nextEntry == null)
+ throw new NoSuchElementException();
+
+ lastReturned = nextEntry;
+ currentKey = lastReturned.key();
+ advance();
+ } while (currentKey == null); // Skip GC'd keys
+
+ return lastReturned;
+ }
+
+ public void remove() {
+ if (lastReturned == null)
+ throw new IllegalStateException();
+ ConcurrentReferenceHashMap.this.remove(currentKey);
+ lastReturned = null;
+ }
+ }
+
+ final class KeyIterator
+ extends HashIterator
+ implements Iterator<K>, Enumeration<K>
+ {
+ public K next() { return super.nextEntry().key(); }
+ public K nextElement() { return super.nextEntry().key(); }
+ }
+
+ final class ValueIterator
+ extends HashIterator
+ implements Iterator<V>, Enumeration<V>
+ {
+ public V next() { return super.nextEntry().value(); }
+ public V nextElement() { return super.nextEntry().value(); }
+ }
+
+ /*
+ * This class is needed for JDK5 compatibility.
+ */
+ static class SimpleEntry<K, V> implements Entry<K, V>,
+ java.io.Serializable {
+ private static final long serialVersionUID = -8499721149061103585L;
+
+ private final K key;
+ private V value;
+
+ public SimpleEntry(K key, V value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public SimpleEntry(Entry<? extends K, ? extends V> entry) {
+ this.key = entry.getKey();
+ this.value = entry.getValue();
+ }
+
+ public K getKey() {
+ return key;
+ }
+
+ public V getValue() {
+ return value;
+ }
+
+ public V setValue(V value) {
+ V oldValue = this.value;
+ this.value = value;
+ return oldValue;
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ @SuppressWarnings("unchecked")
+ Map.Entry e = (Map.Entry) o;
+ return eq(key, e.getKey()) && eq(value, e.getValue());
+ }
+
+ public int hashCode() {
+ return (key == null ? 0 : key.hashCode())
+ ^ (value == null ? 0 : value.hashCode());
+ }
+
+ public String toString() {
+ return key + "=" + value;
+ }
+
+ private static boolean eq(Object o1, Object o2) {
+ return o1 == null ? o2 == null : o1.equals(o2);
+ }
+ }
+
+
+ /**
+ * Custom Entry class used by EntryIterator.next(), that relays setValue
+ * changes to the underlying map.
+ */
+ final class WriteThroughEntry extends SimpleEntry<K,V>
+ {
+ private static final long serialVersionUID = -7900634345345313646L;
+
+ WriteThroughEntry(K k, V v) {
+ super(k,v);
+ }
+
+ /**
+ * Set our entry's value and write through to the map. The
+ * value to return is somewhat arbitrary here. Since a
+ * WriteThroughEntry does not necessarily track asynchronous
+ * changes, the most recent "previous" value could be
+ * different from what we return (or could even have been
+ * removed in which case the put will re-establish). We do not
+ * and cannot guarantee more.
+ */
+ public V setValue(V value) {
+ if (value == null) throw new NullPointerException();
+ V v = super.setValue(value);
+ ConcurrentReferenceHashMap.this.put(getKey(), value);
+ return v;
+ }
+ }
+
+ final class EntryIterator
+ extends HashIterator
+ implements Iterator<Entry<K,V>>
+ {
+ public Map.Entry<K,V> next() {
+ HashEntry<K,V> e = super.nextEntry();
+ return new WriteThroughEntry(e.key(), e.value());
+ }
+ }
+
+ final class KeySet extends AbstractSet<K> {
+ public Iterator<K> iterator() {
+ return new KeyIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsKey(o);
+ }
+ public boolean remove(Object o) {
+ return ConcurrentReferenceHashMap.this.remove(o) != null;
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class Values extends AbstractCollection<V> {
+ public Iterator<V> iterator() {
+ return new ValueIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsValue(o);
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
+ public Iterator<Map.Entry<K,V>> iterator() {
+ return new EntryIterator();
+ }
+ public boolean contains(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ V v = ConcurrentReferenceHashMap.this.get(e.getKey());
+ return v != null && v.equals(e.getValue());
+ }
+ public boolean remove(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ return ConcurrentReferenceHashMap.this.remove(e.getKey(), e.getValue());
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ /* ---------------- Serialization Support -------------- */
+
+ /**
+ * Save the state of the <tt>ConcurrentReferenceHashMap</tt> instance to a
+ * stream (i.e., serialize it).
+ * @param s the stream
+ * @serialData
+ * the key (Object) and value (Object)
+ * for each key-value mapping, followed by a null pair.
+ * The key-value mappings are emitted in no particular order.
+ */
+ private void writeObject(java.io.ObjectOutputStream s) throws IOException {
+ s.defaultWriteObject();
+
+ for (int k = 0; k < segments.length; ++k) {
+ Segment<K,V> seg = segments[k];
+ seg.lock();
+ try {
+ HashEntry<K,V>[] tab = seg.table;
+ for (int i = 0; i < tab.length; ++i) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ K key = e.key();
+ if (key == null) // Skip GC'd keys
+ continue;
+
+ s.writeObject(key);
+ s.writeObject(e.value());
+ }
+ }
+ } finally {
+ seg.unlock();
+ }
+ }
+ s.writeObject(null);
+ s.writeObject(null);
+ }
+
+ /**
+ * Reconstitute the <tt>ConcurrentReferenceHashMap</tt> instance from a
+ * stream (i.e., deserialize it).
+ * @param s the stream
+ */
+ @SuppressWarnings("unchecked")
+ private void readObject(java.io.ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+ s.defaultReadObject();
+
+ // Initialize each segment to be minimally sized, and let grow.
+ for (int i = 0; i < segments.length; ++i) {
+ segments[i].setTable(new HashEntry[1]);
+ }
+
+ // Read the keys and values, and put the mappings in the table
+ for (;;) {
+ K key = (K) s.readObject();
+ V value = (V) s.readObject();
+ if (key == null)
+ break;
+ put(key, value);
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,133 +0,0 @@
-package org.jboss.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-import java.net.URI;
-import java.io.IOException;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.IoFuture;
-
-/**
- * A potential participant in a JBoss Remoting communications relationship.
- *
- * @apiviz.landmark
- */
-public interface Endpoint extends HandleableCloseable<Endpoint> {
- /**
- * Get the endpoint attribute map. This is a storage area for any data associated with this endpoint, including
- * (but not limited to) connection and protocol information, and application information.
- *
- * You must have the TODO permission to invoke this method.
- *
- * @return the endpoint map
- */
- ConcurrentMap<Object, Object> getAttributes();
-
- /**
- * Get the name of this endpoint.
- *
- * @return the endpoint name, or {@code null} if there is no name
- */
- String getName();
-
- /**
- * Create a request handler that can be used to receive incoming requests on this endpoint. The client may be passed to a
- * remote endpoint as part of a request or a reply, or it may be used locally.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission createRequestHandler EndpointPermission} to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param requestListener the request listener
- * @param requestClass the class of requests sent to this request listener
- * @param replyClass the class of replies received back from this request listener
- * @return a handle for the client
- * @throws IOException if an error occurs
- */
- <I, O> Handle<RequestHandler> createRequestHandler(RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException;
-
- /**
- * Create a request handler source that can be used to acquire clients associated with a request listener on this endpoint.
- * The request handler source may be ignored, passed to a remote endpoint as part of a request or a reply, or used locally.
- * The objects that are produced by this method may be used to mass-produce {@code RequestHandler} instances.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission registerService EndpointPermission} to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param configuration the configuration to use
- * @throws IOException if an error occurs
- */
- <I, O> Handle<RequestHandlerSource> registerService(LocalServiceConfiguration<I, O> configuration) throws IOException;
-
- /**
- * Create a client that uses the given request handler to handle its requests.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission createClient EndpointPermission} to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param handler the request handler
- * @param requestClass the class of requests sent through this client
- * @param replyClass the class of replies received back through this client
- * @return the client
- * @throws IOException if an error occurs
- */
- <I, O> Client<I, O> createClient(RequestHandler handler, Class<I> requestClass, Class<O> replyClass) throws IOException;
-
- /**
- * Create a client source that uses the given request handler source to generate clients.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission createClientSource EndpointPermission} to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param handlerSource the request handler source
- * @param requestClass the class of requests sent through this client source
- * @param replyClass the class of replies received back through this client source
- * @return the client source
- * @throws IOException if an error occurs
- */
- <I, O> ClientSource<I, O> createClientSource(RequestHandlerSource handlerSource, Class<I> requestClass, Class<O> replyClass) throws IOException;
-
- /**
- * Attempt to locate a service. The return value then be queried for the service's {@code ClientSource}.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param serviceUri the URI of the service
- * @param requestClass the class of requests sent through the client source
- * @param replyClass the class of replies received back through the client source
- * @return the future service
- * @throws IllegalArgumentException if the given URI is not a valid Remoting service URI
- */
- <I, O> IoFuture<ClientSource<I, O>> locateService(URI serviceUri, Class<I> requestClass, Class<O> replyClass) throws IllegalArgumentException;
-
- /**
- * Register a remotely available service.<p>
- * The remote endpoint must not have the same name as this endpoint. The group name and service type must be
- * non-{@code null} and non-empty. The metric must be greater than zero.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission registerRemoteService EndpointPermission} to invoke this method.
- *
- * @param configuration the remote service configuration
- * @return a closeable that may be used to remove the registration
- * @throws IllegalArgumentException if one of the given arguments was not valid
- * @throws IOException if an error occurs with the registration
- */
- SimpleCloseable registerRemoteService(RemoteServiceConfiguration configuration) throws IllegalArgumentException, IOException;
-
- /**
- * Add a listener for observing when local and remote services are added. The caller may specify whether the listener
- * should be notified of the complete list of currently registered services (set {@code onlyNew} to {@code false})
- * or only services registered after the time of calling this method (set {@code onlyNew} to {@code true}).
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission addServiceListener EndpointPermission} to invoke this method.
- *
- * @param serviceListener the listener
- * @param onlyNew {@code true} if only new registrations should be sent to the listener
- * @return a handle which may be used to unregister the listener
- */
- SimpleCloseable addServiceListener(ServiceListener serviceListener, boolean onlyNew);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Endpoint.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,133 @@
+package org.jboss.remoting3;
+
+import java.util.concurrent.ConcurrentMap;
+import java.net.URI;
+import java.io.IOException;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.IoFuture;
+
+/**
+ * A potential participant in a JBoss Remoting communications relationship.
+ *
+ * @apiviz.landmark
+ */
+public interface Endpoint extends HandleableCloseable<Endpoint> {
+ /**
+ * Get the endpoint attribute map. This is a storage area for any data associated with this endpoint, including
+ * (but not limited to) connection and protocol information, and application information.
+ *
+ * You must have the TODO permission to invoke this method.
+ *
+ * @return the endpoint map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+
+ /**
+ * Get the name of this endpoint.
+ *
+ * @return the endpoint name, or {@code null} if there is no name
+ */
+ String getName();
+
+ /**
+ * Create a request handler that can be used to receive incoming requests on this endpoint. The client may be passed to a
+ * remote endpoint as part of a request or a reply, or it may be used locally.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission createRequestHandler EndpointPermission} to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param requestListener the request listener
+ * @param requestClass the class of requests sent to this request listener
+ * @param replyClass the class of replies received back from this request listener
+ * @return a handle for the client
+ * @throws IOException if an error occurs
+ */
+ <I, O> Handle<RequestHandler> createRequestHandler(RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException;
+
+ /**
+ * Create a request handler source that can be used to acquire clients associated with a request listener on this endpoint.
+ * The request handler source may be ignored, passed to a remote endpoint as part of a request or a reply, or used locally.
+ * The objects that are produced by this method may be used to mass-produce {@code RequestHandler} instances.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission registerService EndpointPermission} to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param configuration the configuration to use
+ * @throws IOException if an error occurs
+ */
+ <I, O> Handle<RequestHandlerSource> registerService(LocalServiceConfiguration<I, O> configuration) throws IOException;
+
+ /**
+ * Create a client that uses the given request handler to handle its requests.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission createClient EndpointPermission} to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param handler the request handler
+ * @param requestClass the class of requests sent through this client
+ * @param replyClass the class of replies received back through this client
+ * @return the client
+ * @throws IOException if an error occurs
+ */
+ <I, O> Client<I, O> createClient(RequestHandler handler, Class<I> requestClass, Class<O> replyClass) throws IOException;
+
+ /**
+ * Create a client source that uses the given request handler source to generate clients.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission createClientSource EndpointPermission} to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param handlerSource the request handler source
+ * @param requestClass the class of requests sent through this client source
+ * @param replyClass the class of replies received back through this client source
+ * @return the client source
+ * @throws IOException if an error occurs
+ */
+ <I, O> ClientSource<I, O> createClientSource(RequestHandlerSource handlerSource, Class<I> requestClass, Class<O> replyClass) throws IOException;
+
+ /**
+ * Attempt to locate a service. The return value then be queried for the service's {@code ClientSource}.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param serviceUri the URI of the service
+ * @param requestClass the class of requests sent through the client source
+ * @param replyClass the class of replies received back through the client source
+ * @return the future service
+ * @throws IllegalArgumentException if the given URI is not a valid Remoting service URI
+ */
+ <I, O> IoFuture<ClientSource<I, O>> locateService(URI serviceUri, Class<I> requestClass, Class<O> replyClass) throws IllegalArgumentException;
+
+ /**
+ * Register a remotely available service.<p>
+ * The remote endpoint must not have the same name as this endpoint. The group name and service type must be
+ * non-{@code null} and non-empty. The metric must be greater than zero.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission registerRemoteService EndpointPermission} to invoke this method.
+ *
+ * @param configuration the remote service configuration
+ * @return a closeable that may be used to remove the registration
+ * @throws IllegalArgumentException if one of the given arguments was not valid
+ * @throws IOException if an error occurs with the registration
+ */
+ SimpleCloseable registerRemoteService(RemoteServiceConfiguration configuration) throws IllegalArgumentException, IOException;
+
+ /**
+ * Add a listener for observing when local and remote services are added. The caller may specify whether the listener
+ * should be notified of the complete list of currently registered services (set {@code onlyNew} to {@code false})
+ * or only services registered after the time of calling this method (set {@code onlyNew} to {@code true}).
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission addServiceListener EndpointPermission} to invoke this method.
+ *
+ * @param serviceListener the listener
+ * @param onlyNew {@code true} if only new registrations should be sent to the listener
+ * @return a handle which may be used to unregister the listener
+ */
+ SimpleCloseable addServiceListener(ServiceListener serviceListener, boolean onlyNew);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,463 +0,0 @@
-package org.jboss.remoting;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.EndpointPermission;
-import org.jboss.remoting.LocalServiceConfiguration;
-import org.jboss.remoting.RemoteServiceConfiguration;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.ServiceListener;
-import org.jboss.remoting.ServiceURI;
-import org.jboss.remoting.SimpleCloseable;
-import org.jboss.remoting.Version;
-import org.jboss.remoting.spi.AbstractHandleableCloseable;
-import org.jboss.remoting.spi.AbstractSimpleCloseable;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.xnio.FailedIoFuture;
-import org.jboss.xnio.FinishedIoFuture;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.WeakCloseable;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class EndpointImpl extends AbstractHandleableCloseable<Endpoint> implements Endpoint {
-
- static {
- // Print Remoting "greeting" message
- Logger.getLogger("org.jboss.remoting").info("JBoss Remoting version %s", Version.VERSION);
- }
-
- static <K, V> Map<K, V> hashMap() {
- return new HashMap<K, V>();
- }
-
- static <T> Set<T> hashSet() {
- return new HashSet<T>();
- }
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.endpoint");
-
- private final String name;
-
- private final ConcurrentMap<Object, Object> endpointMap = new ConcurrentHashMap<Object, Object>();
-
- private final Object serviceLock = new Object();
- private final Map<Object, ServiceListenerRegistration> serviceListenerMap = hashMap();
- private final Set<ServiceRegistration> serviceRegistrations = hashSet();
-
- private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint");
- private static final EndpointPermission CREATE_REQUEST_HANDLER_PERM = new EndpointPermission("createRequestHandler");
- private static final EndpointPermission REGISTER_SERVICE_PERM = new EndpointPermission("registerService");
- private static final EndpointPermission CREATE_CLIENT_PERM = new EndpointPermission("createClient");
- private static final EndpointPermission CREATE_CLIENT_SOURCE_PERM = new EndpointPermission("createClientSource");
- private static final EndpointPermission REGISTER_REMOTE_SERVICE_PERM = new EndpointPermission("registerRemoteService");
- private static final EndpointPermission ADD_SERVICE_LISTENER_PERM = new EndpointPermission("addServiceListener");
-
- public EndpointImpl(final Executor executor, final String name) {
- super(executor);
- final SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(CREATE_ENDPOINT_PERM);
- }
- this.executor = executor;
- this.name = name;
- }
-
- private final Executor executor;
-
- protected Executor getOrderedExecutor() {
- return new OrderedExecutor(executor);
- }
-
- protected Executor getExecutor() {
- return executor;
- }
-
- // Endpoint implementation
-
- public String getName() {
- return name;
- }
-
- public ConcurrentMap<Object, Object> getAttributes() {
- return endpointMap;
- }
-
- public <I, O> Handle<RequestHandler> createRequestHandler(final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(CREATE_REQUEST_HANDLER_PERM);
- }
- LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
- config.setExecutor(executor);
- config.setRequestListener(requestListener);
- config.setClientContext(new ClientContextImpl(executor));
- final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
- final WeakCloseable lrhCloseable = new WeakCloseable(localRequestHandler);
- final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
- public void handleClose(final Endpoint closed) {
- IoUtils.safeClose(lrhCloseable);
- }
- });
- localRequestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
- public void handleClose(final RequestHandler closed) {
- key.remove();
- }
- });
- localRequestHandler.open();
- return localRequestHandler.getHandle();
- }
-
- public <I, O> Handle<RequestHandlerSource> registerService(final LocalServiceConfiguration<I, O> configuration) throws IOException {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(REGISTER_SERVICE_PERM);
- }
- final String serviceType = configuration.getServiceType();
- final String groupName = configuration.getGroupName();
- final int metric = configuration.getMetric();
- if (serviceType == null) {
- throw new NullPointerException("serviceType is null");
- }
- if (groupName == null) {
- throw new NullPointerException("groupName is null");
- }
- if (serviceType.length() == 0) {
- throw new IllegalArgumentException("serviceType is empty");
- }
- if (groupName.length() == 0) {
- throw new IllegalArgumentException("groupName is empty");
- }
- if (metric < 0) {
- throw new IllegalArgumentException("metric must be greater than or equal to zero");
- }
- final LocalRequestHandlerSource.Config<I, O> config = new LocalRequestHandlerSource.Config<I,O>(configuration.getRequestClass(), configuration.getReplyClass());
- config.setRequestListener(configuration.getRequestListener());
- config.setExecutor(executor);
- final LocalRequestHandlerSource<I, O> localRequestHandlerSource = new LocalRequestHandlerSource<I, O>(config);
- final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, name, localRequestHandlerSource);
- final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
- protected void closeAction() throws IOException {
- synchronized (serviceLock) {
- serviceRegistrations.remove(registration);
- }
- }
- };
- registration.setHandle(newHandle);
- synchronized (serviceLock) {
- serviceRegistrations.add(registration);
- for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
- final ServiceListener listener = slr.getServiceListener();
- try {
- final ServiceListener.ServiceInfo serviceInfo = new ServiceListener.ServiceInfo();
- serviceInfo.setEndpointName(name);
- serviceInfo.setGroupName(groupName);
- serviceInfo.setServiceType(serviceType);
- serviceInfo.setMetric(metric);
- serviceInfo.setRegistrationHandle(newHandle);
- serviceInfo.setRemote(false);
- serviceInfo.setRequestHandlerSource(localRequestHandlerSource);
- listener.serviceRegistered(slr.handle, serviceInfo);
- } catch (Throwable t) {
- logListenerError(t);
- }
- }
- }
- final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(localRequestHandlerSource));
- final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
- public void handleClose(final Endpoint closed) {
- IoUtils.safeClose(lrhCloseable);
- }
- });
- localRequestHandlerSource.addCloseHandler(new CloseHandler<RequestHandlerSource>() {
- public void handleClose(final RequestHandlerSource closed) {
- key.remove();
- }
- });
- localRequestHandlerSource.open();
- return localRequestHandlerSource.getHandle();
- }
-
- private static void logListenerError(final Throwable t) {
- log.error(t, "Service listener threw an exception");
- }
-
- public <I, O> Client<I, O> createClient(final RequestHandler requestHandler, final Class<I> requestType, final Class<O> replyType) throws IOException {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(CREATE_CLIENT_PERM);
- }
- boolean ok = false;
- final Handle<RequestHandler> handle = requestHandler.getHandle();
- try {
- final ClientImpl<I, O> client = ClientImpl.create(handle, executor, requestType, replyType);
- final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(client));
- final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
- public void handleClose(final Endpoint closed) {
- IoUtils.safeClose(lrhCloseable);
- }
- });
- client.addCloseHandler(new CloseHandler<Client>() {
- public void handleClose(final Client closed) {
- key.remove();
- }
- });
- ok = true;
- return client;
- } finally {
- if (! ok) {
- IoUtils.safeClose(handle);
- }
- }
- }
-
- public <I, O> ClientSource<I, O> createClientSource(final RequestHandlerSource requestHandlerSource, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(CREATE_CLIENT_SOURCE_PERM);
- }
- boolean ok = false;
- final Handle<RequestHandlerSource> handle = requestHandlerSource.getHandle();
- try {
- final ClientSourceImpl<I, O> clientSource = ClientSourceImpl.create(handle, this, requestClass, replyClass);
- final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(clientSource));
- final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
- public void handleClose(final Endpoint closed) {
- IoUtils.safeClose(lrhCloseable);
- }
- });
- clientSource.addCloseHandler(new CloseHandler<ClientSource>() {
- public void handleClose(final ClientSource closed) {
- key.remove();
- }
- });
- ok = true;
- return clientSource;
- } finally {
- if (! ok) {
- IoUtils.safeClose(handle);
- }
- }
- }
-
- public <I, O> IoFuture<ClientSource<I, O>> locateService(final URI serviceUri, final Class<I> requestClass, final Class<O> replyClass) throws IllegalArgumentException {
- if (serviceUri == null) {
- throw new NullPointerException("serviceUri is null");
- }
- if (! ServiceURI.isRemotingServiceUri(serviceUri)) {
- throw new IllegalArgumentException("Not a valid remoting service URI");
- }
- final String endpointName = ServiceURI.getEndpointName(serviceUri);
- final String groupName = ServiceURI.getGroupName(serviceUri);
- final String serviceType = ServiceURI.getServiceType(serviceUri);
- synchronized (serviceLock) {
- int bestMetric = Integer.MAX_VALUE;
- List<ServiceRegistration> candidates = new ArrayList<ServiceRegistration>();
- for (ServiceRegistration svc : serviceRegistrations) {
- if (svc.matches(serviceType, groupName, endpointName)) {
- final int metric = svc.getMetric();
- if (metric < bestMetric) {
- candidates.clear();
- candidates.add(svc);
- } else if (metric == bestMetric) {
- candidates.add(svc);
- }
- }
- }
- final int size = candidates.size();
- if (size == 0) {
- final FutureClientSource<I, O> futureClientSource = new FutureClientSource<I, O>();
- final SimpleCloseable listenerHandle = addServiceListener(new ServiceListener() {
- public void serviceRegistered(final SimpleCloseable listenerHandle, final ServiceInfo info) {
- final String addedEndpointName = info.getEndpointName();
- final String addedServiceType = info.getServiceType();
- final String addedGroupName = info.getGroupName();
- final RequestHandlerSource requestHandlerSource = info.getRequestHandlerSource();
- if (endpointName != null && endpointName.length() > 0 && !endpointName.equals(addedEndpointName)) {
- // no match
- return;
- }
- if (serviceType != null && serviceType.length() > 0 && !serviceType.equals(addedServiceType)) {
- // no match
- return;
- }
- if (groupName != null && groupName.length() > 0 && !groupName.equals(addedGroupName)) {
- // no match
- return;
- }
- try {
- // match!
- final ClientSource<I, O> clientSource = createClientSource(requestHandlerSource, requestClass, replyClass);
- futureClientSource.setResult(clientSource);
- } catch (IOException e) {
- futureClientSource.setException(e);
- } finally {
- IoUtils.safeClose(listenerHandle);
- }
- }
- }, true);
- futureClientSource.setListenerHandle(listenerHandle);
- return futureClientSource;
- }
- final RequestHandlerSource handlerSource;
- if (size == 1) {
- handlerSource = candidates.get(0).getHandlerSource();
- } else {
- int idx = (int) ((double) candidates.size() * Math.random());
- handlerSource = candidates.get(idx).getHandlerSource();
- }
- try {
- return new FinishedIoFuture<ClientSource<I,O>>(createClientSource(handlerSource, requestClass, replyClass));
- } catch (IOException e) {
- return new FailedIoFuture<ClientSource<I,O>>(e);
- }
- }
- }
-
- public SimpleCloseable registerRemoteService(final RemoteServiceConfiguration configuration) throws IllegalArgumentException, IOException {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(REGISTER_REMOTE_SERVICE_PERM);
- }
- final RequestHandlerSource handlerSource = configuration.getRequestHandlerSource();
- final String serviceType = configuration.getServiceType();
- final String groupName = configuration.getGroupName();
- final String endpointName = configuration.getEndpointName();
- final int metric = configuration.getMetric();
- if (handlerSource == null) {
- throw new NullPointerException("handlerSource is null");
- }
- if (serviceType == null) {
- throw new NullPointerException("serviceType is null");
- }
- if (groupName == null) {
- throw new NullPointerException("groupName is null");
- }
- if (endpointName == null) {
- throw new NullPointerException("endpointName is null");
- }
- if (serviceType.length() == 0) {
- throw new IllegalArgumentException("serviceType is empty");
- }
- if (groupName.length() == 0) {
- throw new IllegalArgumentException("groupName is empty");
- }
- if (endpointName.length() == 0) {
- throw new IllegalArgumentException("endpointName is empty");
- }
- if (endpointName.equals(name)) {
- throw new IllegalArgumentException("remote endpoint has the same name as the local endpoint");
- }
- if (metric < 1) {
- throw new IllegalArgumentException("metric must be greater than zero");
- }
- final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, endpointName, metric, handlerSource);
- final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
- protected void closeAction() throws IOException {
- synchronized (serviceLock) {
- serviceRegistrations.remove(registration);
- }
- }
- };
- registration.setHandle(newHandle);
- synchronized (serviceLock) {
- serviceRegistrations.add(registration);
- for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
- final ServiceListener listener = slr.getServiceListener();
- try {
- final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
- info.setEndpointName(endpointName);
- info.setGroupName(groupName);
- info.setMetric(metric);
- info.setRegistrationHandle(newHandle);
- info.setRemote(true);
- info.setRequestHandlerSource(handlerSource);
- info.setServiceType(serviceType);
- listener.serviceRegistered(slr.handle, info);
- } catch (Throwable t) {
- logListenerError(t);
- }
- }
- }
- return newHandle;
- }
-
- public SimpleCloseable addServiceListener(final ServiceListener serviceListener, final boolean onlyNew) {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPermission(ADD_SERVICE_LISTENER_PERM);
- }
- final Object key = new Object();
- synchronized (serviceLock) {
- final ServiceListenerRegistration registration = new ServiceListenerRegistration(serviceListener);
- serviceListenerMap.put(key, registration);
- final AbstractSimpleCloseable handle = new AbstractSimpleCloseable(executor) {
- protected void closeAction() throws IOException {
- synchronized (serviceLock) {
- serviceListenerMap.remove(key);
- }
- }
- };
- registration.setHandle(handle);
- if (! onlyNew) {
- for (final ServiceRegistration reg : serviceRegistrations) {
- try {
- final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
- info.setEndpointName(reg.getEndpointName());
- info.setGroupName(reg.getGroupName());
- info.setMetric(reg.getMetric());
- info.setRegistrationHandle(reg.getHandle());
- info.setRemote(reg.isRemote());
- info.setRequestHandlerSource(reg.getHandlerSource());
- info.setServiceType(reg.getServiceType());
- serviceListener.serviceRegistered(handle, info);
- } catch (Throwable t) {
- logListenerError(t);
- }
- }
- }
- return handle;
- }
- }
-
- private static final class ServiceListenerRegistration {
- private final ServiceListener serviceListener;
- private volatile SimpleCloseable handle;
-
- private ServiceListenerRegistration(final ServiceListener serviceListener) {
- this.serviceListener = serviceListener;
- }
-
- ServiceListener getServiceListener() {
- return serviceListener;
- }
-
- void setHandle(final SimpleCloseable handle) {
- this.handle = handle;
- }
- }
-
- public String toString() {
- return "endpoint \"" + name + "\" <" + Integer.toString(hashCode()) + ">";
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,463 @@
+package org.jboss.remoting3;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+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;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.xnio.FailedIoFuture;
+import org.jboss.xnio.FinishedIoFuture;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.WeakCloseable;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class EndpointImpl extends AbstractHandleableCloseable<Endpoint> implements Endpoint {
+
+ static {
+ // Print Remoting "greeting" message
+ Logger.getLogger("org.jboss.remoting").info("JBoss Remoting version %s", Version.VERSION);
+ }
+
+ static <K, V> Map<K, V> hashMap() {
+ return new HashMap<K, V>();
+ }
+
+ static <T> Set<T> hashSet() {
+ return new HashSet<T>();
+ }
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.endpoint");
+
+ private final String name;
+
+ private final ConcurrentMap<Object, Object> endpointMap = new ConcurrentHashMap<Object, Object>();
+
+ private final Object serviceLock = new Object();
+ private final Map<Object, ServiceListenerRegistration> serviceListenerMap = hashMap();
+ private final Set<ServiceRegistration> serviceRegistrations = hashSet();
+
+ private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint");
+ private static final EndpointPermission CREATE_REQUEST_HANDLER_PERM = new EndpointPermission("createRequestHandler");
+ private static final EndpointPermission REGISTER_SERVICE_PERM = new EndpointPermission("registerService");
+ private static final EndpointPermission CREATE_CLIENT_PERM = new EndpointPermission("createClient");
+ private static final EndpointPermission CREATE_CLIENT_SOURCE_PERM = new EndpointPermission("createClientSource");
+ private static final EndpointPermission REGISTER_REMOTE_SERVICE_PERM = new EndpointPermission("registerRemoteService");
+ private static final EndpointPermission ADD_SERVICE_LISTENER_PERM = new EndpointPermission("addServiceListener");
+
+ public EndpointImpl(final Executor executor, final String name) {
+ super(executor);
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_ENDPOINT_PERM);
+ }
+ this.executor = executor;
+ this.name = name;
+ }
+
+ private final Executor executor;
+
+ protected Executor getOrderedExecutor() {
+ return new OrderedExecutor(executor);
+ }
+
+ protected Executor getExecutor() {
+ return executor;
+ }
+
+ // Endpoint implementation
+
+ public String getName() {
+ return name;
+ }
+
+ public ConcurrentMap<Object, Object> getAttributes() {
+ return endpointMap;
+ }
+
+ public <I, O> Handle<RequestHandler> createRequestHandler(final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_REQUEST_HANDLER_PERM);
+ }
+ LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
+ config.setExecutor(executor);
+ config.setRequestListener(requestListener);
+ config.setClientContext(new ClientContextImpl(executor));
+ final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
+ final WeakCloseable lrhCloseable = new WeakCloseable(localRequestHandler);
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ localRequestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ key.remove();
+ }
+ });
+ localRequestHandler.open();
+ return localRequestHandler.getHandle();
+ }
+
+ public <I, O> Handle<RequestHandlerSource> registerService(final LocalServiceConfiguration<I, O> configuration) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(REGISTER_SERVICE_PERM);
+ }
+ final String serviceType = configuration.getServiceType();
+ final String groupName = configuration.getGroupName();
+ final int metric = configuration.getMetric();
+ if (serviceType == null) {
+ throw new NullPointerException("serviceType is null");
+ }
+ if (groupName == null) {
+ throw new NullPointerException("groupName is null");
+ }
+ if (serviceType.length() == 0) {
+ throw new IllegalArgumentException("serviceType is empty");
+ }
+ if (groupName.length() == 0) {
+ throw new IllegalArgumentException("groupName is empty");
+ }
+ if (metric < 0) {
+ throw new IllegalArgumentException("metric must be greater than or equal to zero");
+ }
+ final LocalRequestHandlerSource.Config<I, O> config = new LocalRequestHandlerSource.Config<I,O>(configuration.getRequestClass(), configuration.getReplyClass());
+ config.setRequestListener(configuration.getRequestListener());
+ config.setExecutor(executor);
+ final LocalRequestHandlerSource<I, O> localRequestHandlerSource = new LocalRequestHandlerSource<I, O>(config);
+ final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, name, localRequestHandlerSource);
+ final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceRegistrations.remove(registration);
+ }
+ }
+ };
+ registration.setHandle(newHandle);
+ synchronized (serviceLock) {
+ serviceRegistrations.add(registration);
+ for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
+ final ServiceListener listener = slr.getServiceListener();
+ try {
+ final ServiceListener.ServiceInfo serviceInfo = new ServiceListener.ServiceInfo();
+ serviceInfo.setEndpointName(name);
+ serviceInfo.setGroupName(groupName);
+ serviceInfo.setServiceType(serviceType);
+ serviceInfo.setMetric(metric);
+ serviceInfo.setRegistrationHandle(newHandle);
+ serviceInfo.setRemote(false);
+ serviceInfo.setRequestHandlerSource(localRequestHandlerSource);
+ listener.serviceRegistered(slr.handle, serviceInfo);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(localRequestHandlerSource));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ localRequestHandlerSource.addCloseHandler(new CloseHandler<RequestHandlerSource>() {
+ public void handleClose(final RequestHandlerSource closed) {
+ key.remove();
+ }
+ });
+ localRequestHandlerSource.open();
+ return localRequestHandlerSource.getHandle();
+ }
+
+ private static void logListenerError(final Throwable t) {
+ log.error(t, "Service listener threw an exception");
+ }
+
+ public <I, O> Client<I, O> createClient(final RequestHandler requestHandler, final Class<I> requestType, final Class<O> replyType) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_CLIENT_PERM);
+ }
+ boolean ok = false;
+ final Handle<RequestHandler> handle = requestHandler.getHandle();
+ try {
+ final ClientImpl<I, O> client = ClientImpl.create(handle, executor, requestType, replyType);
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(client));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ client.addCloseHandler(new CloseHandler<Client>() {
+ public void handleClose(final Client closed) {
+ key.remove();
+ }
+ });
+ ok = true;
+ return client;
+ } finally {
+ if (! ok) {
+ IoUtils.safeClose(handle);
+ }
+ }
+ }
+
+ public <I, O> ClientSource<I, O> createClientSource(final RequestHandlerSource requestHandlerSource, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_CLIENT_SOURCE_PERM);
+ }
+ boolean ok = false;
+ final Handle<RequestHandlerSource> handle = requestHandlerSource.getHandle();
+ try {
+ final ClientSourceImpl<I, O> clientSource = ClientSourceImpl.create(handle, this, requestClass, replyClass);
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(clientSource));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ clientSource.addCloseHandler(new CloseHandler<ClientSource>() {
+ public void handleClose(final ClientSource closed) {
+ key.remove();
+ }
+ });
+ ok = true;
+ return clientSource;
+ } finally {
+ if (! ok) {
+ IoUtils.safeClose(handle);
+ }
+ }
+ }
+
+ public <I, O> IoFuture<ClientSource<I, O>> locateService(final URI serviceUri, final Class<I> requestClass, final Class<O> replyClass) throws IllegalArgumentException {
+ if (serviceUri == null) {
+ throw new NullPointerException("serviceUri is null");
+ }
+ if (! ServiceURI.isRemotingServiceUri(serviceUri)) {
+ throw new IllegalArgumentException("Not a valid remoting service URI");
+ }
+ final String endpointName = ServiceURI.getEndpointName(serviceUri);
+ final String groupName = ServiceURI.getGroupName(serviceUri);
+ final String serviceType = ServiceURI.getServiceType(serviceUri);
+ synchronized (serviceLock) {
+ int bestMetric = Integer.MAX_VALUE;
+ List<ServiceRegistration> candidates = new ArrayList<ServiceRegistration>();
+ for (ServiceRegistration svc : serviceRegistrations) {
+ if (svc.matches(serviceType, groupName, endpointName)) {
+ final int metric = svc.getMetric();
+ if (metric < bestMetric) {
+ candidates.clear();
+ candidates.add(svc);
+ } else if (metric == bestMetric) {
+ candidates.add(svc);
+ }
+ }
+ }
+ final int size = candidates.size();
+ if (size == 0) {
+ final FutureClientSource<I, O> futureClientSource = new FutureClientSource<I, O>();
+ final SimpleCloseable listenerHandle = addServiceListener(new ServiceListener() {
+ public void serviceRegistered(final SimpleCloseable listenerHandle, final ServiceInfo info) {
+ final String addedEndpointName = info.getEndpointName();
+ final String addedServiceType = info.getServiceType();
+ final String addedGroupName = info.getGroupName();
+ final RequestHandlerSource requestHandlerSource = info.getRequestHandlerSource();
+ if (endpointName != null && endpointName.length() > 0 && !endpointName.equals(addedEndpointName)) {
+ // no match
+ return;
+ }
+ if (serviceType != null && serviceType.length() > 0 && !serviceType.equals(addedServiceType)) {
+ // no match
+ return;
+ }
+ if (groupName != null && groupName.length() > 0 && !groupName.equals(addedGroupName)) {
+ // no match
+ return;
+ }
+ try {
+ // match!
+ final ClientSource<I, O> clientSource = createClientSource(requestHandlerSource, requestClass, replyClass);
+ futureClientSource.setResult(clientSource);
+ } catch (IOException e) {
+ futureClientSource.setException(e);
+ } finally {
+ IoUtils.safeClose(listenerHandle);
+ }
+ }
+ }, true);
+ futureClientSource.setListenerHandle(listenerHandle);
+ return futureClientSource;
+ }
+ final RequestHandlerSource handlerSource;
+ if (size == 1) {
+ handlerSource = candidates.get(0).getHandlerSource();
+ } else {
+ int idx = (int) ((double) candidates.size() * Math.random());
+ handlerSource = candidates.get(idx).getHandlerSource();
+ }
+ try {
+ return new FinishedIoFuture<ClientSource<I,O>>(createClientSource(handlerSource, requestClass, replyClass));
+ } catch (IOException e) {
+ return new FailedIoFuture<ClientSource<I,O>>(e);
+ }
+ }
+ }
+
+ public SimpleCloseable registerRemoteService(final RemoteServiceConfiguration configuration) throws IllegalArgumentException, IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(REGISTER_REMOTE_SERVICE_PERM);
+ }
+ final RequestHandlerSource handlerSource = configuration.getRequestHandlerSource();
+ final String serviceType = configuration.getServiceType();
+ final String groupName = configuration.getGroupName();
+ final String endpointName = configuration.getEndpointName();
+ final int metric = configuration.getMetric();
+ if (handlerSource == null) {
+ throw new NullPointerException("handlerSource is null");
+ }
+ if (serviceType == null) {
+ throw new NullPointerException("serviceType is null");
+ }
+ if (groupName == null) {
+ throw new NullPointerException("groupName is null");
+ }
+ if (endpointName == null) {
+ throw new NullPointerException("endpointName is null");
+ }
+ if (serviceType.length() == 0) {
+ throw new IllegalArgumentException("serviceType is empty");
+ }
+ if (groupName.length() == 0) {
+ throw new IllegalArgumentException("groupName is empty");
+ }
+ if (endpointName.length() == 0) {
+ throw new IllegalArgumentException("endpointName is empty");
+ }
+ if (endpointName.equals(name)) {
+ throw new IllegalArgumentException("remote endpoint has the same name as the local endpoint");
+ }
+ if (metric < 1) {
+ throw new IllegalArgumentException("metric must be greater than zero");
+ }
+ final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, endpointName, metric, handlerSource);
+ final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceRegistrations.remove(registration);
+ }
+ }
+ };
+ registration.setHandle(newHandle);
+ synchronized (serviceLock) {
+ serviceRegistrations.add(registration);
+ for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
+ final ServiceListener listener = slr.getServiceListener();
+ try {
+ final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
+ info.setEndpointName(endpointName);
+ info.setGroupName(groupName);
+ info.setMetric(metric);
+ info.setRegistrationHandle(newHandle);
+ info.setRemote(true);
+ info.setRequestHandlerSource(handlerSource);
+ info.setServiceType(serviceType);
+ listener.serviceRegistered(slr.handle, info);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ return newHandle;
+ }
+
+ public SimpleCloseable addServiceListener(final ServiceListener serviceListener, final boolean onlyNew) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(ADD_SERVICE_LISTENER_PERM);
+ }
+ final Object key = new Object();
+ synchronized (serviceLock) {
+ final ServiceListenerRegistration registration = new ServiceListenerRegistration(serviceListener);
+ serviceListenerMap.put(key, registration);
+ final AbstractSimpleCloseable handle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceListenerMap.remove(key);
+ }
+ }
+ };
+ registration.setHandle(handle);
+ if (! onlyNew) {
+ for (final ServiceRegistration reg : serviceRegistrations) {
+ try {
+ final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
+ info.setEndpointName(reg.getEndpointName());
+ info.setGroupName(reg.getGroupName());
+ info.setMetric(reg.getMetric());
+ info.setRegistrationHandle(reg.getHandle());
+ info.setRemote(reg.isRemote());
+ info.setRequestHandlerSource(reg.getHandlerSource());
+ info.setServiceType(reg.getServiceType());
+ serviceListener.serviceRegistered(handle, info);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ return handle;
+ }
+ }
+
+ private static final class ServiceListenerRegistration {
+ private final ServiceListener serviceListener;
+ private volatile SimpleCloseable handle;
+
+ private ServiceListenerRegistration(final ServiceListener serviceListener) {
+ this.serviceListener = serviceListener;
+ }
+
+ ServiceListener getServiceListener() {
+ return serviceListener;
+ }
+
+ void setHandle(final SimpleCloseable handle) {
+ this.handle = handle;
+ }
+ }
+
+ public String toString() {
+ return "endpoint \"" + name + "\" <" + Integer.toString(hashCode()) + ">";
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointPermission.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointPermission.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointPermission.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.security.BasicPermission;
-
-/**
- * This class is for permissions relating to Remoting endpoints.
- */
-public class EndpointPermission extends BasicPermission {
-
- private static final long serialVersionUID = 4984517897378387571L;
-
- /**
- * Creates a new {@code EndpointPermission} object with the specified name.
- * The name is the symbolic name of the {@code EndpointPermission}.
- *
- * @param name the name of the {@code EndpointPermission}
- *
- * @throws NullPointerException if {@code name} is {@code null}
- * @throws IllegalArgumentException if {@code name} is empty
- */
- public EndpointPermission(String name) throws NullPointerException, IllegalArgumentException {
- super(name);
- }
-
- /**
- * Creates a new {@code EndpointPermission} object with the specified name.
- * The name is the symbolic name of the {@code EndpointPermission}, and the
- * actions string is currently unused.
- *
- * @param name the name of the {@code EndpointPermission}
- * @param actions ignored
- *
- * @throws NullPointerException if {@code name} is {@code null}
- * @throws IllegalArgumentException if {@code name} is empty
- */
- public EndpointPermission(String name, String actions) throws NullPointerException, IllegalArgumentException {
- super(name, actions);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointPermission.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointPermission.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointPermission.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/EndpointPermission.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.security.BasicPermission;
+
+/**
+ * This class is for permissions relating to Remoting endpoints.
+ */
+public class EndpointPermission extends BasicPermission {
+
+ private static final long serialVersionUID = 4984517897378387571L;
+
+ /**
+ * Creates a new {@code EndpointPermission} object with the specified name.
+ * The name is the symbolic name of the {@code EndpointPermission}.
+ *
+ * @param name the name of the {@code EndpointPermission}
+ *
+ * @throws NullPointerException if {@code name} is {@code null}
+ * @throws IllegalArgumentException if {@code name} is empty
+ */
+ public EndpointPermission(String name) throws NullPointerException, IllegalArgumentException {
+ super(name);
+ }
+
+ /**
+ * Creates a new {@code EndpointPermission} object with the specified name.
+ * The name is the symbolic name of the {@code EndpointPermission}, and the
+ * actions string is currently unused.
+ *
+ * @param name the name of the {@code EndpointPermission}
+ * @param actions ignored
+ *
+ * @throws NullPointerException if {@code name} is {@code null}
+ * @throws IllegalArgumentException if {@code name} is empty
+ */
+ public EndpointPermission(String name, String actions) throws NullPointerException, IllegalArgumentException {
+ super(name, actions);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.SimpleCloseable;
-import org.jboss.xnio.AbstractIoFuture;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.IoUtils;
-
-/**
- *
- */
-final class FutureClientSource<I, O> extends AbstractIoFuture<ClientSource<I, O>> {
-
- private volatile SimpleCloseable listenerHandle;
-
- protected boolean setException(final IOException exception) {
- return super.setException(exception);
- }
-
- protected boolean setResult(final ClientSource<I, O> result) {
- return super.setResult(result);
- }
-
- public IoFuture<ClientSource<I, O>> cancel() {
- IoUtils.safeClose(listenerHandle);
- return this;
- }
-
- void setListenerHandle(final SimpleCloseable listenerHandle) {
- this.listenerHandle = listenerHandle;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureClientSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+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;
+
+/**
+ *
+ */
+final class FutureClientSource<I, O> extends AbstractIoFuture<ClientSource<I, O>> {
+
+ private volatile SimpleCloseable listenerHandle;
+
+ protected boolean setException(final IOException exception) {
+ return super.setException(exception);
+ }
+
+ protected boolean setResult(final ClientSource<I, O> result) {
+ return super.setResult(result);
+ }
+
+ public IoFuture<ClientSource<I, O>> cancel() {
+ IoUtils.safeClose(listenerHandle);
+ return this;
+ }
+
+ void setListenerHandle(final SimpleCloseable listenerHandle) {
+ this.listenerHandle = listenerHandle;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import org.jboss.remoting.ReplyException;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.xnio.AbstractIoFuture;
-import org.jboss.xnio.IoFuture;
-
-/**
- *
- */
-final class FutureReplyImpl<O> extends AbstractIoFuture<O> {
-
- private final Executor executor;
- private final Class<O> replyType;
- private final ReplyHandler replyHandler = new Handler();
- private volatile RemoteRequestContext remoteRequestContext;
-
- FutureReplyImpl(final Executor executor, final Class<O> replyType) {
- this.executor = executor;
- this.replyType = replyType;
- }
-
- void setRemoteRequestContext(final RemoteRequestContext remoteRequestContext) {
- this.remoteRequestContext = remoteRequestContext;
- }
-
- public IoFuture<O> cancel() {
- // must not be called before setRemoteRequestContext
- remoteRequestContext.cancel();
- return this;
- }
-
- protected Executor getNotifierExecutor() {
- return executor;
- }
-
- ReplyHandler getReplyHandler() {
- return replyHandler;
- }
-
- private final class Handler implements ReplyHandler {
-
- public void handleReply(final Object reply) {
- final O actualReply;
- try {
- actualReply = replyType.cast(reply);
- } catch (ClassCastException e) {
- setException(new ReplyException("Reply was of the wrong type (got <" + reply.getClass().getName() + ">; expected <? extends " + replyType.getName() + ">"));
- return;
- }
- setResult(actualReply);
- }
-
- public void handleException(final IOException exception) {
- setException(exception);
- }
-
- public void handleCancellation() {
- finishCancel();
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/FutureReplyImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+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;
+import org.jboss.xnio.IoFuture;
+
+/**
+ *
+ */
+final class FutureReplyImpl<O> extends AbstractIoFuture<O> {
+
+ private final Executor executor;
+ private final Class<O> replyType;
+ private final ReplyHandler replyHandler = new Handler();
+ private volatile RemoteRequestContext remoteRequestContext;
+
+ FutureReplyImpl(final Executor executor, final Class<O> replyType) {
+ this.executor = executor;
+ this.replyType = replyType;
+ }
+
+ void setRemoteRequestContext(final RemoteRequestContext remoteRequestContext) {
+ this.remoteRequestContext = remoteRequestContext;
+ }
+
+ public IoFuture<O> cancel() {
+ // must not be called before setRemoteRequestContext
+ remoteRequestContext.cancel();
+ return this;
+ }
+
+ protected Executor getNotifierExecutor() {
+ return executor;
+ }
+
+ ReplyHandler getReplyHandler() {
+ return replyHandler;
+ }
+
+ private final class Handler implements ReplyHandler {
+
+ public void handleReply(final Object reply) {
+ final O actualReply;
+ try {
+ actualReply = replyType.cast(reply);
+ } catch (ClassCastException e) {
+ setException(new ReplyException("Reply was of the wrong type (got <" + reply.getClass().getName() + ">; expected <? extends " + replyType.getName() + ">"));
+ return;
+ }
+ setResult(actualReply);
+ }
+
+ public void handleException(final IOException exception) {
+ setException(exception);
+ }
+
+ public void handleCancellation() {
+ finishCancel();
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,43 +0,0 @@
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.io.Closeable;
-
-/**
- * A Remoting resource that can be closed.
- *
- * @param <T> the type that is passed to the close handler
- *
- * @apiviz.exclude
- */
-public interface HandleableCloseable<T> extends Closeable {
-
- /**
- * Close, waiting for any outstanding processing to finish.
- *
- * @throws IOException if the close failed
- */
- void close() throws IOException;
-
- /**
- * Add a handler that will be called upon close. The handler may be called before or after the close acutally
- * takes place.
- *
- * @param handler the close handler
- * @return a key which may be used to later remove this handler
- */
- Key addCloseHandler(CloseHandler<? super T> handler);
-
- /**
- * A key which may be used to remove this handler.
- *
- * @apiviz.exclude
- */
- interface Key {
-
- /**
- * Remove the registered handler. Calling this method more than once has no additional effect.
- */
- void remove();
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/HandleableCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,43 @@
+package org.jboss.remoting3;
+
+import java.io.IOException;
+import java.io.Closeable;
+
+/**
+ * A Remoting resource that can be closed.
+ *
+ * @param <T> the type that is passed to the close handler
+ *
+ * @apiviz.exclude
+ */
+public interface HandleableCloseable<T> extends Closeable {
+
+ /**
+ * Close, waiting for any outstanding processing to finish.
+ *
+ * @throws IOException if the close failed
+ */
+ void close() throws IOException;
+
+ /**
+ * Add a handler that will be called upon close. The handler may be called before or after the close acutally
+ * takes place.
+ *
+ * @param handler the close handler
+ * @return a key which may be used to later remove this handler
+ */
+ Key addCloseHandler(CloseHandler<? super T> handler);
+
+ /**
+ * A key which may be used to remove this handler.
+ *
+ * @apiviz.exclude
+ */
+ interface Key {
+
+ /**
+ * Remove the registered handler. Calling this method more than once has no additional effect.
+ */
+ void remove();
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/IndeterminateOutcomeException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/IndeterminateOutcomeException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,48 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * An exception that is thrown when an operation terminates in such a way that the outcome cannot be known.
- */
-public class IndeterminateOutcomeException extends RemotingException {
-
- private static final long serialVersionUID = 6304843915977033800L;
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with no detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public IndeterminateOutcomeException() {
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message. The cause is not initialized,
- * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public IndeterminateOutcomeException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public IndeterminateOutcomeException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public IndeterminateOutcomeException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/IndeterminateOutcomeException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/IndeterminateOutcomeException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/IndeterminateOutcomeException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,48 @@
+package org.jboss.remoting3;
+
+/**
+ * An exception that is thrown when an operation terminates in such a way that the outcome cannot be known.
+ */
+public class IndeterminateOutcomeException extends RemotingException {
+
+ private static final long serialVersionUID = 6304843915977033800L;
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with no detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public IndeterminateOutcomeException() {
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message. The cause is not initialized,
+ * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public IndeterminateOutcomeException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public IndeterminateOutcomeException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public IndeterminateOutcomeException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,157 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.RemoteRequestException;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class LocalRequestHandler<I, O> extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
-
- private final RequestListener<I, O> requestListener;
- private final ClientContextImpl clientContext;
- private final Class<I> requestClass;
- private final Class<O> replyClass;
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.listener");
-
- LocalRequestHandler(Config<I, O> config) {
- super(config.getExecutor());
- requestListener = config.getRequestListener();
- clientContext = config.getClientContext();
- requestClass = config.getRequestClass();
- replyClass = config.getReplyClass();
- }
-
- public RemoteRequestContext receiveRequest(final Object request, final ReplyHandler replyHandler) {
- final RequestContextImpl<O> context = new RequestContextImpl<O>(replyHandler, clientContext, replyClass);
- try {
- final I castRequest;
- try {
- castRequest = requestClass.cast(request);
- } catch (ClassCastException e) {
- SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Request is the wrong type; expected " + requestClass + " but got " + request.getClass()));
- return SpiUtils.getBlankRemoteRequestContext();
- }
- context.execute(new Runnable() {
- public void run() {
- try {
- requestListener.handleRequest(context, castRequest);
- } catch (RemoteExecutionException e) {
- SpiUtils.safeHandleException(replyHandler, e);
- } catch (Throwable t) {
- SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Request handler threw an exception", t));
- }
- }
- });
- } catch (RejectedExecutionException e) {
- SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Execution was rejected (server may be too busy)", e));
- return SpiUtils.getBlankRemoteRequestContext();
- }
- return new RemoteRequestContext() {
- public void cancel() {
- context.cancel();
- }
- };
- }
-
- protected void closeAction() throws IOException {
- try {
- requestListener.handleClientClose(clientContext);
- } catch (Throwable t) {
- log.error(t, "Unexpected exception in request listener client close handler method");
- }
- }
-
- void open() throws IOException {
- try {
- requestListener.handleClientOpen(clientContext);
- } catch (Throwable t) {
- final IOException ioe = new IOException("Failed to open client context");
- ioe.initCause(t);
- throw ioe;
- }
- }
-
- public String toString() {
- return "local request handler <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
- }
-
- static class Config<I, O> {
- private final Class<I> requestClass;
- private final Class<O> replyClass;
-
- private Executor executor;
- private RequestListener<I, O> requestListener;
- private ClientContextImpl clientContext;
-
- Config(final Class<I> requestClass, final Class<O> replyClass) {
- this.requestClass = requestClass;
- this.replyClass = replyClass;
- }
-
- public Class<I> getRequestClass() {
- return requestClass;
- }
-
- public Class<O> getReplyClass() {
- return replyClass;
- }
-
- public Executor getExecutor() {
- return executor;
- }
-
- public void setExecutor(final Executor executor) {
- this.executor = executor;
- }
-
- public RequestListener<I, O> getRequestListener() {
- return requestListener;
- }
-
- public void setRequestListener(final RequestListener<I, O> requestListener) {
- this.requestListener = requestListener;
- }
-
- public ClientContextImpl getClientContext() {
- return clientContext;
- }
-
- public void setClientContext(final ClientContextImpl clientContext) {
- this.clientContext = clientContext;
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+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;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class LocalRequestHandler<I, O> extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
+
+ private final RequestListener<I, O> requestListener;
+ private final ClientContextImpl clientContext;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.listener");
+
+ LocalRequestHandler(Config<I, O> config) {
+ super(config.getExecutor());
+ requestListener = config.getRequestListener();
+ clientContext = config.getClientContext();
+ requestClass = config.getRequestClass();
+ replyClass = config.getReplyClass();
+ }
+
+ public RemoteRequestContext receiveRequest(final Object request, final ReplyHandler replyHandler) {
+ final RequestContextImpl<O> context = new RequestContextImpl<O>(replyHandler, clientContext, replyClass);
+ try {
+ final I castRequest;
+ try {
+ castRequest = requestClass.cast(request);
+ } catch (ClassCastException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Request is the wrong type; expected " + requestClass + " but got " + request.getClass()));
+ return SpiUtils.getBlankRemoteRequestContext();
+ }
+ context.execute(new Runnable() {
+ public void run() {
+ try {
+ requestListener.handleRequest(context, castRequest);
+ } catch (RemoteExecutionException e) {
+ SpiUtils.safeHandleException(replyHandler, e);
+ } catch (Throwable t) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Request handler threw an exception", t));
+ }
+ }
+ });
+ } catch (RejectedExecutionException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Execution was rejected (server may be too busy)", e));
+ return SpiUtils.getBlankRemoteRequestContext();
+ }
+ return new RemoteRequestContext() {
+ public void cancel() {
+ context.cancel();
+ }
+ };
+ }
+
+ protected void closeAction() throws IOException {
+ try {
+ requestListener.handleClientClose(clientContext);
+ } catch (Throwable t) {
+ log.error(t, "Unexpected exception in request listener client close handler method");
+ }
+ }
+
+ void open() throws IOException {
+ try {
+ requestListener.handleClientOpen(clientContext);
+ } catch (Throwable t) {
+ final IOException ioe = new IOException("Failed to open client context");
+ ioe.initCause(t);
+ throw ioe;
+ }
+ }
+
+ public String toString() {
+ return "local request handler <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ }
+
+ static class Config<I, O> {
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private Executor executor;
+ private RequestListener<I, O> requestListener;
+ private ClientContextImpl clientContext;
+
+ Config(final Class<I> requestClass, final Class<O> replyClass) {
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ public Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ public Class<O> getReplyClass() {
+ return replyClass;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ public RequestListener<I, O> getRequestListener() {
+ return requestListener;
+ }
+
+ public void setRequestListener(final RequestListener<I, O> requestListener) {
+ this.requestListener = requestListener;
+ }
+
+ public ClientContextImpl getClientContext() {
+ return clientContext;
+ }
+
+ public void setClientContext(final ClientContextImpl clientContext) {
+ this.clientContext = clientContext;
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.RequestListener;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class LocalRequestHandlerSource<I, O> extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
-
- private final RequestListener<I, O> requestListener;
- private final ServiceContextImpl serviceContext;
- private final Executor executor;
- private final Class<I> requestClass;
- private final Class<O> replyClass;
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting.listener-source");
-
- LocalRequestHandlerSource(final Config<I, O> config) {
- super(config.getExecutor());
- requestClass = config.getRequestClass();
- replyClass = config.getReplyClass();
- requestListener = config.getRequestListener();
- executor = config.getExecutor();
- serviceContext = new ServiceContextImpl(executor);
- }
-
- public Handle<RequestHandler> createRequestHandler() throws IOException {
- if (isOpen()) {
- final LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
- config.setExecutor(executor);
- config.setRequestListener(requestListener);
- config.setClientContext(new ClientContextImpl(serviceContext));
- final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
- localRequestHandler.open();
- return localRequestHandler.getHandle();
- } else {
- throw new IOException("LocalRequestHandlerSource is closed");
- }
- }
-
- void open() throws IOException {
- try {
- requestListener.handleServiceOpen(serviceContext);
- addCloseHandler(new CloseHandler<RequestHandlerSource>() {
- public void handleClose(final RequestHandlerSource closed) {
- try {
- requestListener.handleServiceClose(serviceContext);
- } catch (Throwable t) {
- log.error(t, "Unexpected exception in request listener client close handler method");
- }
- }
- });
- } catch (Throwable t) {
- final IOException ioe = new IOException("Failed to open client context");
- ioe.initCause(t);
- throw ioe;
- }
- }
-
- ServiceContextImpl getServiceContext() {
- return serviceContext;
- }
-
- public String toString() {
- return "local request handler source <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
- }
-
- static class Config<I, O> {
- private final Class<I> requestClass;
- private final Class<O> replyClass;
- private Executor executor;
- private RequestListener<I, O> requestListener;
-
- Config(final Class<I> requestClass, final Class<O> replyClass) {
- this.requestClass = requestClass;
- this.replyClass = replyClass;
- }
-
- public Class<I> getRequestClass() {
- return requestClass;
- }
-
- public Class<O> getReplyClass() {
- return replyClass;
- }
-
- public Executor getExecutor() {
- return executor;
- }
-
- public void setExecutor(final Executor executor) {
- this.executor = executor;
- }
-
- public RequestListener<I, O> getRequestListener() {
- return requestListener;
- }
-
- public void setRequestListener(final RequestListener<I, O> requestListener) {
- this.requestListener = requestListener;
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalRequestHandlerSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+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;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class LocalRequestHandlerSource<I, O> extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
+
+ private final RequestListener<I, O> requestListener;
+ private final ServiceContextImpl serviceContext;
+ private final Executor executor;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.listener-source");
+
+ LocalRequestHandlerSource(final Config<I, O> config) {
+ super(config.getExecutor());
+ requestClass = config.getRequestClass();
+ replyClass = config.getReplyClass();
+ requestListener = config.getRequestListener();
+ executor = config.getExecutor();
+ serviceContext = new ServiceContextImpl(executor);
+ }
+
+ public Handle<RequestHandler> createRequestHandler() throws IOException {
+ if (isOpen()) {
+ final LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
+ config.setExecutor(executor);
+ config.setRequestListener(requestListener);
+ config.setClientContext(new ClientContextImpl(serviceContext));
+ final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
+ localRequestHandler.open();
+ return localRequestHandler.getHandle();
+ } else {
+ throw new IOException("LocalRequestHandlerSource is closed");
+ }
+ }
+
+ void open() throws IOException {
+ try {
+ requestListener.handleServiceOpen(serviceContext);
+ addCloseHandler(new CloseHandler<RequestHandlerSource>() {
+ public void handleClose(final RequestHandlerSource closed) {
+ try {
+ requestListener.handleServiceClose(serviceContext);
+ } catch (Throwable t) {
+ log.error(t, "Unexpected exception in request listener client close handler method");
+ }
+ }
+ });
+ } catch (Throwable t) {
+ final IOException ioe = new IOException("Failed to open client context");
+ ioe.initCause(t);
+ throw ioe;
+ }
+ }
+
+ ServiceContextImpl getServiceContext() {
+ return serviceContext;
+ }
+
+ public String toString() {
+ return "local request handler source <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ }
+
+ static class Config<I, O> {
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+ private Executor executor;
+ private RequestListener<I, O> requestListener;
+
+ Config(final Class<I> requestClass, final Class<O> replyClass) {
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ public Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ public Class<O> getReplyClass() {
+ return replyClass;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ public RequestListener<I, O> getRequestListener() {
+ return requestListener;
+ }
+
+ public void setRequestListener(final RequestListener<I, O> requestListener) {
+ this.requestListener = requestListener;
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalServiceConfiguration.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalServiceConfiguration.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalServiceConfiguration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,131 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * A configuration for a service to be deployed into the endpoint.
- *
- * @apiviz.exclude
- */
-public final class LocalServiceConfiguration<I, O> {
- private final RequestListener<I, O> requestListener;
- private final Class<I> requestClass;
- private final Class<O> replyClass;
- private String serviceType;
- private String groupName;
- private int metric;
-
- /**
- * Construct a new instance.
- *
- * @param requestListener the request listener
- * @param requestClass the request class
- * @param replyClass the reply class
- */
- public LocalServiceConfiguration(final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) {
- this.requestListener = requestListener;
- this.requestClass = requestClass;
- this.replyClass = replyClass;
- }
-
- /**
- * Get the request listener for this service.
- *
- * @return the request listener
- */
- public RequestListener<I, O> getRequestListener() {
- return requestListener;
- }
-
- /**
- * Get the request class.
- *
- * @return the request class
- */
- public Class<I> getRequestClass() {
- return requestClass;
- }
-
- /**
- * Get the reply class.
- *
- * @return the reply class
- */
- public Class<O> getReplyClass() {
- return replyClass;
- }
-
- /**
- * Get the service type.
- *
- * @return the service type
- */
- public String getServiceType() {
- return serviceType;
- }
-
- /**
- * Set the service type.
- *
- * @param serviceType the service type
- */
- public void setServiceType(final String serviceType) {
- this.serviceType = serviceType;
- }
-
- /**
- * Get the group name.
- *
- * @return the group name
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Set the group name.
- *
- * @param groupName the group name
- */
- public void setGroupName(final String groupName) {
- this.groupName = groupName;
- }
-
- /**
- * Get the metric.
- *
- * @return the metric
- */
- public int getMetric() {
- return metric;
- }
-
- /**
- * Set the metric.
- *
- * @param metric the metric
- */
- public void setMetric(final int metric) {
- this.metric = metric;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalServiceConfiguration.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalServiceConfiguration.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalServiceConfiguration.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/LocalServiceConfiguration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * A configuration for a service to be deployed into the endpoint.
+ *
+ * @apiviz.exclude
+ */
+public final class LocalServiceConfiguration<I, O> {
+ private final RequestListener<I, O> requestListener;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+ private String serviceType;
+ private String groupName;
+ private int metric;
+
+ /**
+ * Construct a new instance.
+ *
+ * @param requestListener the request listener
+ * @param requestClass the request class
+ * @param replyClass the reply class
+ */
+ public LocalServiceConfiguration(final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) {
+ this.requestListener = requestListener;
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ /**
+ * Get the request listener for this service.
+ *
+ * @return the request listener
+ */
+ public RequestListener<I, O> getRequestListener() {
+ return requestListener;
+ }
+
+ /**
+ * Get the request class.
+ *
+ * @return the request class
+ */
+ public Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ /**
+ * Get the reply class.
+ *
+ * @return the reply class
+ */
+ public Class<O> getReplyClass() {
+ return replyClass;
+ }
+
+ /**
+ * Get the service type.
+ *
+ * @return the service type
+ */
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ /**
+ * Set the service type.
+ *
+ * @param serviceType the service type
+ */
+ public void setServiceType(final String serviceType) {
+ this.serviceType = serviceType;
+ }
+
+ /**
+ * Get the group name.
+ *
+ * @return the group name
+ */
+ public String getGroupName() {
+ return groupName;
+ }
+
+ /**
+ * Set the group name.
+ *
+ * @param groupName the group name
+ */
+ public void setGroupName(final String groupName) {
+ this.groupName = groupName;
+ }
+
+ /**
+ * Get the metric.
+ *
+ * @return the metric
+ */
+ public int getMetric() {
+ return metric;
+ }
+
+ /**
+ * Set the metric.
+ *
+ * @param metric the metric
+ */
+ public void setMetric(final int metric) {
+ this.metric = metric;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.LinkedList;
-import java.util.concurrent.Executor;
-import org.jboss.xnio.log.Logger;
-
-/**
- * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
- * <p/>
- * More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
- * same method, will result in B's task running after A's.
- */
-final class OrderedExecutor implements Executor {
- private static final Logger log = Logger.getLogger(OrderedExecutor.class);
-
- // @protectedby tasks
- private final LinkedList<Runnable> tasks = new LinkedList<Runnable>();
- // @protectedby tasks
- private boolean running;
- private final Executor parent;
- private final Runnable runner;
-
- /**
- * Construct a new instance.
- *
- * @param parent the parent executor
- */
- OrderedExecutor(final Executor parent) {
- this.parent = parent;
- runner = new Runnable() {
- public void run() {
- for (;;) {
- final Runnable task;
- synchronized(tasks) {
- task = tasks.poll();
- if (task == null) {
- running = false;
- return;
- }
- }
- try {
- task.run();
- } catch (Throwable t) {
- log.error(t, "Runnable task %s failed", task);
- }
- }
- }
- };
- }
-
- /**
- * Run a task.
- *
- * @param command the task to run.
- */
- public void execute(Runnable command) {
- synchronized(tasks) {
- tasks.add(command);
- if (! running) {
- running = true;
- boolean ok = false;
- try {
- parent.execute(runner);
- ok = true;
- } finally {
- if (! ok) {
- running = false;
- }
- }
- }
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/OrderedExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.util.LinkedList;
+import java.util.concurrent.Executor;
+import org.jboss.xnio.log.Logger;
+
+/**
+ * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
+ * <p/>
+ * More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
+ * same method, will result in B's task running after A's.
+ */
+final class OrderedExecutor implements Executor {
+ private static final Logger log = Logger.getLogger(OrderedExecutor.class);
+
+ // @protectedby tasks
+ private final LinkedList<Runnable> tasks = new LinkedList<Runnable>();
+ // @protectedby tasks
+ private boolean running;
+ private final Executor parent;
+ private final Runnable runner;
+
+ /**
+ * Construct a new instance.
+ *
+ * @param parent the parent executor
+ */
+ OrderedExecutor(final Executor parent) {
+ this.parent = parent;
+ runner = new Runnable() {
+ public void run() {
+ for (;;) {
+ final Runnable task;
+ synchronized(tasks) {
+ task = tasks.poll();
+ if (task == null) {
+ running = false;
+ return;
+ }
+ }
+ try {
+ task.run();
+ } catch (Throwable t) {
+ log.error(t, "Runnable task %s failed", task);
+ }
+ }
+ }
+ };
+ }
+
+ /**
+ * Run a task.
+ *
+ * @param command the task to run.
+ */
+ public void execute(Runnable command) {
+ synchronized(tasks) {
+ tasks.add(command);
+ if (! running) {
+ running = true;
+ boolean ok = false;
+ try {
+ parent.execute(runner);
+ ok = true;
+ } finally {
+ if (! ok) {
+ running = false;
+ }
+ }
+ }
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/QualifiedName.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,258 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.Arrays;
-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
- * zero or more name segments. The string representation of a qualified name is a sequence of a forward slash
- * ({@code /}) followed by a non-empty URL-encoded name segment.
- */
-public final class QualifiedName implements Comparable<QualifiedName>, Iterable<String> {
-
- /**
- * The root name.
- */
- public static final QualifiedName ROOT_NAME = new QualifiedName(new String[0]);
-
- private final String[] segments;
-
- /**
- * Create a new qualified name from the given name segments.
- *
- * @param nameSegments the name segments
- * @throws NullPointerException if {@code nameSegments} is {@code null} or if any element of that array is {@code null}
- * @throws IllegalArgumentException if an element of {@code nameSegments} is an empty string
- */
- public QualifiedName(final String[] nameSegments) throws NullPointerException, IllegalArgumentException {
- if (nameSegments == null) {
- throw new NullPointerException("segments is null");
- }
- String[] segments = nameSegments.clone();
- for (String s : segments) {
- if (s == null) {
- throw new NullPointerException("Null segment");
- }
- if (s.length() == 0) {
- throw new IllegalArgumentException("Empty segment");
- }
- }
- this.segments = segments;
- }
-
- /**
- * Compare this qualified name to another for equality. Returns {@code true} if both names have the same number of segments
- * with the same content.
- *
- * @param o the object to compare to
- * @return {@code true} if the given object is a qualified name which is equal to this name
- */
- public boolean equals(final Object o) {
- if (this == o) return true;
- if (! (o instanceof QualifiedName)) return false;
- final QualifiedName name = (QualifiedName) o;
- if (!Arrays.equals(segments, name.segments)) return false;
- return true;
- }
-
- /**
- * Get the hash code of this qualified name. Equal to the return value of {@link Arrays#hashCode(Object[]) Arrays.hashCode(segments)}
- * where {@code segments} is the array of decoded segment strings.
- *
- * @return the hash code
- */
- public int hashCode() {
- return Arrays.hashCode(segments);
- }
-
- /**
- * Compare this qualified name to another. Each segment is compared in turn; if they are equal then the comparison
- * carries on to the next segment. If all leading segments are equal but one qualified name has more segments,
- * then the longer name is said to come after the shorter name.
- *
- * @param o the other name
- * @return {@code 0} if the elements are equal, {@code -1} if this name comes before the given name, or {@code 1} if
- * this name comes after the given name
- */
- public int compareTo(final QualifiedName o) {
- if (this == o) return 0;
- String[] a = segments;
- String[] b = o.segments;
- final int alen = a.length;
- final int blen = b.length;
- for (int i = 0; i < alen && i < blen; i ++) {
- final int cmp = a[i].compareTo(b[i]);
- if (cmp != 0) {
- return cmp;
- }
- }
- if (alen < blen) {
- return -1;
- } else if (alen > blen) {
- return 1;
- } else {
- return 0;
- }
- }
-
- /**
- * Get the string representation of this qualified name. The root name is "{@code /}"; all other names are comprised
- * of one or more consecutive character sequences of a forward slash followed by one or more URL-encoded characters.
- *
- * @return the string representation of this name
- */
- public String toString() {
- StringBuilder builder = new StringBuilder();
- if (segments.length == 0) {
- return "/";
- } else for (String segment : segments) {
- try {
- builder.append('/');
- builder.append(URLEncoder.encode(segment, "utf-8"));
- } catch (UnsupportedEncodingException e) {
- // cannot happen
- throw new IllegalStateException(e);
- }
- }
- return builder.toString();
- }
-
- /**
- * Parse an absolute qualified name. An absolute qualified name must consist of either a single forward slash ("{@code /}") or else
- * a series of path components, each comprised of a single forward slash followed by a URL-encoded series of non-forward-slash
- * characters.
- *
- * @param path the encoded absolute path
- * @return the qualified name
- */
- public static QualifiedName parse(String path) {
- final int len = path.length();
- if (len < 1) {
- throw new IllegalArgumentException("Empty path");
- }
- if (path.charAt(0) != '/') {
- throw new IllegalArgumentException("Relative paths are not allowed");
- }
- if (len == 1) {
- return ROOT_NAME;
- }
- return ROOT_NAME.parseRelative(path.substring(1));
- }
-
- /**
- * Get an iterator over the sequence of strings.
- *
- * @return an iterator
- */
- public Iterator<String> iterator() {
- return new Iterator<String>() {
- int i;
-
- public boolean hasNext() {
- return i < segments.length;
- }
-
- public String next() {
- try {
- return segments[i++];
- } catch (ArrayIndexOutOfBoundsException e) {
- throw new NoSuchElementException("next() past end");
- }
- }
-
- public void remove() {
- throw new UnsupportedOperationException("remove()");
- }
- };
- }
-
- /**
- * Parse a qualified name relative to this one. A relative qualified name must consist of
- * a series of segments comprised of one or more URL-encoded characters separated by forward slashes ("{@code /}").
- *
- * @param path the encoded relative path
- * @return the qualified name
- */
- public QualifiedName parseRelative(String path) {
- if (path == null) {
- throw new NullPointerException("path is null");
- }
- List<String> decoded = new ArrayList<String>();
- int segStart = 0;
- int segEnd;
- do {
- segEnd = path.indexOf('/', segStart);
- String segment = segEnd == -1 ? path.substring(segStart) : path.substring(segStart, segEnd);
- if (segment.length() == 0) {
- throw new IllegalArgumentException(segEnd == -1 ? "Invalid trailing slash" : "Empty segment in path");
- }
- try {
- decoded.add(URLDecoder.decode(segment, "utf-8"));
- } catch (UnsupportedEncodingException e) {
- // cannot happen
- throw new IllegalStateException(e);
- }
- segStart = segEnd + 1;
- } while (segEnd != -1);
- final String[] segments = this.segments;
- final int length = segments.length;
- final String[] newSegments = new String[length + decoded.size()];
- System.arraycopy(segments, 0, newSegments, 0, length);
- for (int i = 0; i < decoded.size(); i ++) {
- newSegments[i + length] = decoded.get(i);
- }
- return new QualifiedName(newSegments);
- }
-
- /**
- * Get a new {@code org.jboss.remoting.QualifiedName} relative to this one.
- *
- * @param relativePath the segment to append
- * @return the new {@code org.jboss.remoting.QualifiedName} instance
- */
- public QualifiedName appendRelative(String relativePath) {
- final String[] segments = this.segments;
- final int length = segments.length;
- final String[] newSegments = new String[length + 1];
- System.arraycopy(segments, 0, newSegments, 0, length);
- newSegments[length] = relativePath;
- return new QualifiedName(newSegments);
- }
-
- /**
- * Get the number of segments in this name.
- *
- * @return the number of segments
- */
- public int length() {
- return segments.length;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/QualifiedName.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/QualifiedName.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,258 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.util.Arrays;
+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
+ * zero or more name segments. The string representation of a qualified name is a sequence of a forward slash
+ * ({@code /}) followed by a non-empty URL-encoded name segment.
+ */
+public final class QualifiedName implements Comparable<QualifiedName>, Iterable<String> {
+
+ /**
+ * The root name.
+ */
+ public static final QualifiedName ROOT_NAME = new QualifiedName(new String[0]);
+
+ private final String[] segments;
+
+ /**
+ * Create a new qualified name from the given name segments.
+ *
+ * @param nameSegments the name segments
+ * @throws NullPointerException if {@code nameSegments} is {@code null} or if any element of that array is {@code null}
+ * @throws IllegalArgumentException if an element of {@code nameSegments} is an empty string
+ */
+ public QualifiedName(final String[] nameSegments) throws NullPointerException, IllegalArgumentException {
+ if (nameSegments == null) {
+ throw new NullPointerException("segments is null");
+ }
+ String[] segments = nameSegments.clone();
+ for (String s : segments) {
+ if (s == null) {
+ throw new NullPointerException("Null segment");
+ }
+ if (s.length() == 0) {
+ throw new IllegalArgumentException("Empty segment");
+ }
+ }
+ this.segments = segments;
+ }
+
+ /**
+ * Compare this qualified name to another for equality. Returns {@code true} if both names have the same number of segments
+ * with the same content.
+ *
+ * @param o the object to compare to
+ * @return {@code true} if the given object is a qualified name which is equal to this name
+ */
+ public boolean equals(final Object o) {
+ if (this == o) return true;
+ if (! (o instanceof QualifiedName)) return false;
+ final QualifiedName name = (QualifiedName) o;
+ if (!Arrays.equals(segments, name.segments)) return false;
+ return true;
+ }
+
+ /**
+ * Get the hash code of this qualified name. Equal to the return value of {@link Arrays#hashCode(Object[]) Arrays.hashCode(segments)}
+ * where {@code segments} is the array of decoded segment strings.
+ *
+ * @return the hash code
+ */
+ public int hashCode() {
+ return Arrays.hashCode(segments);
+ }
+
+ /**
+ * Compare this qualified name to another. Each segment is compared in turn; if they are equal then the comparison
+ * carries on to the next segment. If all leading segments are equal but one qualified name has more segments,
+ * then the longer name is said to come after the shorter name.
+ *
+ * @param o the other name
+ * @return {@code 0} if the elements are equal, {@code -1} if this name comes before the given name, or {@code 1} if
+ * this name comes after the given name
+ */
+ public int compareTo(final QualifiedName o) {
+ if (this == o) return 0;
+ String[] a = segments;
+ String[] b = o.segments;
+ final int alen = a.length;
+ final int blen = b.length;
+ for (int i = 0; i < alen && i < blen; i ++) {
+ final int cmp = a[i].compareTo(b[i]);
+ if (cmp != 0) {
+ return cmp;
+ }
+ }
+ if (alen < blen) {
+ return -1;
+ } else if (alen > blen) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * Get the string representation of this qualified name. The root name is "{@code /}"; all other names are comprised
+ * of one or more consecutive character sequences of a forward slash followed by one or more URL-encoded characters.
+ *
+ * @return the string representation of this name
+ */
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ if (segments.length == 0) {
+ return "/";
+ } else for (String segment : segments) {
+ try {
+ builder.append('/');
+ builder.append(URLEncoder.encode(segment, "utf-8"));
+ } catch (UnsupportedEncodingException e) {
+ // cannot happen
+ throw new IllegalStateException(e);
+ }
+ }
+ return builder.toString();
+ }
+
+ /**
+ * Parse an absolute qualified name. An absolute qualified name must consist of either a single forward slash ("{@code /}") or else
+ * a series of path components, each comprised of a single forward slash followed by a URL-encoded series of non-forward-slash
+ * characters.
+ *
+ * @param path the encoded absolute path
+ * @return the qualified name
+ */
+ public static QualifiedName parse(String path) {
+ final int len = path.length();
+ if (len < 1) {
+ throw new IllegalArgumentException("Empty path");
+ }
+ if (path.charAt(0) != '/') {
+ throw new IllegalArgumentException("Relative paths are not allowed");
+ }
+ if (len == 1) {
+ return ROOT_NAME;
+ }
+ return ROOT_NAME.parseRelative(path.substring(1));
+ }
+
+ /**
+ * Get an iterator over the sequence of strings.
+ *
+ * @return an iterator
+ */
+ public Iterator<String> iterator() {
+ return new Iterator<String>() {
+ int i;
+
+ public boolean hasNext() {
+ return i < segments.length;
+ }
+
+ public String next() {
+ try {
+ return segments[i++];
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throw new NoSuchElementException("next() past end");
+ }
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException("remove()");
+ }
+ };
+ }
+
+ /**
+ * Parse a qualified name relative to this one. A relative qualified name must consist of
+ * a series of segments comprised of one or more URL-encoded characters separated by forward slashes ("{@code /}").
+ *
+ * @param path the encoded relative path
+ * @return the qualified name
+ */
+ public QualifiedName parseRelative(String path) {
+ if (path == null) {
+ throw new NullPointerException("path is null");
+ }
+ List<String> decoded = new ArrayList<String>();
+ int segStart = 0;
+ int segEnd;
+ do {
+ segEnd = path.indexOf('/', segStart);
+ String segment = segEnd == -1 ? path.substring(segStart) : path.substring(segStart, segEnd);
+ if (segment.length() == 0) {
+ throw new IllegalArgumentException(segEnd == -1 ? "Invalid trailing slash" : "Empty segment in path");
+ }
+ try {
+ decoded.add(URLDecoder.decode(segment, "utf-8"));
+ } catch (UnsupportedEncodingException e) {
+ // cannot happen
+ throw new IllegalStateException(e);
+ }
+ segStart = segEnd + 1;
+ } while (segEnd != -1);
+ final String[] segments = this.segments;
+ final int length = segments.length;
+ final String[] newSegments = new String[length + decoded.size()];
+ System.arraycopy(segments, 0, newSegments, 0, length);
+ for (int i = 0; i < decoded.size(); i ++) {
+ newSegments[i + length] = decoded.get(i);
+ }
+ return new QualifiedName(newSegments);
+ }
+
+ /**
+ * Get a new {@code org.jboss.remoting.QualifiedName} relative to this one.
+ *
+ * @param relativePath the segment to append
+ * @return the new {@code org.jboss.remoting.QualifiedName} instance
+ */
+ public QualifiedName appendRelative(String relativePath) {
+ final String[] segments = this.segments;
+ final int length = segments.length;
+ final String[] newSegments = new String[length + 1];
+ System.arraycopy(segments, 0, newSegments, 0, length);
+ newSegments[length] = relativePath;
+ return new QualifiedName(newSegments);
+ }
+
+ /**
+ * Get the number of segments in this name.
+ *
+ * @return the number of segments
+ */
+ public int length() {
+ return segments.length;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,101 +0,0 @@
-package org.jboss.remoting;
-
-import java.util.LinkedList;
-import java.util.Queue;
-import org.jboss.xnio.CloseableExecutor;
-import org.jboss.xnio.log.Logger;
-
-/**
- * An executor designed to run all submitted tasks in the current thread. The queue is run continuously
- * until the {@code close()} method is invoked. Jobs may be submitted to the queue from any thread.
- * Only one thread should invoke the {@code runQueue()} method, which will run until the executor is
- * shut down.
- */
-final class QueueExecutor implements CloseableExecutor {
- private static final Logger log = org.jboss.xnio.log.Logger.getLogger(QueueExecutor.class);
-
- private final Queue<Runnable> queue = new LinkedList<Runnable>();
-
- private State state = State.WAITING;
-
- private enum State {
- RUNNING,
- WAITING,
- STOPPING,
- DOWN,
- }
-
- public void execute(Runnable command) {
- synchronized(queue) {
- switch (state) {
- case WAITING:
- state = State.RUNNING;
- queue.notify();
- // fall thru
- case STOPPING:
- case RUNNING:
- queue.add(command);
- break;
- default:
- throw new IllegalStateException("Executor is no longer available");
- }
- }
- }
-
- public void runQueue() {
- boolean intr = Thread.interrupted();
- try {
- for (;;) {
- final State newState;
- synchronized(queue) {
- while (state == State.WAITING) {
- try {
- queue.wait();
- } catch (InterruptedException e) {
- intr = true;
- }
- }
- if (state == State.DOWN) {
- throw new IllegalStateException("DOWN");
- }
- newState = state;
- }
- for (;;) {
- final Runnable runnable;
- synchronized(queue) {
- runnable = queue.poll();
- if (runnable == null) {
- break;
- }
- }
- try {
- runnable.run();
- } catch (Throwable t) {
- log.trace(t, "Error occurred while processing run queue");
- }
- }
- if (newState == State.STOPPING) {
- synchronized(queue) {
- state = State.DOWN;
- return;
- }
- }
- }
- } finally {
- if (intr) {
- Thread.currentThread().interrupt();
- }
- }
- }
-
- public void close() {
- synchronized(queue) {
- switch (state) {
- case WAITING:
- queue.notify();
- case RUNNING:
- state = State.STOPPING;
- }
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/QueueExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,101 @@
+package org.jboss.remoting3;
+
+import java.util.LinkedList;
+import java.util.Queue;
+import org.jboss.xnio.CloseableExecutor;
+import org.jboss.xnio.log.Logger;
+
+/**
+ * An executor designed to run all submitted tasks in the current thread. The queue is run continuously
+ * until the {@code close()} method is invoked. Jobs may be submitted to the queue from any thread.
+ * Only one thread should invoke the {@code runQueue()} method, which will run until the executor is
+ * shut down.
+ */
+final class QueueExecutor implements CloseableExecutor {
+ private static final Logger log = org.jboss.xnio.log.Logger.getLogger(QueueExecutor.class);
+
+ private final Queue<Runnable> queue = new LinkedList<Runnable>();
+
+ private State state = State.WAITING;
+
+ private enum State {
+ RUNNING,
+ WAITING,
+ STOPPING,
+ DOWN,
+ }
+
+ public void execute(Runnable command) {
+ synchronized(queue) {
+ switch (state) {
+ case WAITING:
+ state = State.RUNNING;
+ queue.notify();
+ // fall thru
+ case STOPPING:
+ case RUNNING:
+ queue.add(command);
+ break;
+ default:
+ throw new IllegalStateException("Executor is no longer available");
+ }
+ }
+ }
+
+ public void runQueue() {
+ boolean intr = Thread.interrupted();
+ try {
+ for (;;) {
+ final State newState;
+ synchronized(queue) {
+ while (state == State.WAITING) {
+ try {
+ queue.wait();
+ } catch (InterruptedException e) {
+ intr = true;
+ }
+ }
+ if (state == State.DOWN) {
+ throw new IllegalStateException("DOWN");
+ }
+ newState = state;
+ }
+ for (;;) {
+ final Runnable runnable;
+ synchronized(queue) {
+ runnable = queue.poll();
+ if (runnable == null) {
+ break;
+ }
+ }
+ try {
+ runnable.run();
+ } catch (Throwable t) {
+ log.trace(t, "Error occurred while processing run queue");
+ }
+ }
+ if (newState == State.STOPPING) {
+ synchronized(queue) {
+ state = State.DOWN;
+ return;
+ }
+ }
+ }
+ } finally {
+ if (intr) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ public void close() {
+ synchronized(queue) {
+ switch (state) {
+ case WAITING:
+ queue.notify();
+ case RUNNING:
+ state = State.STOPPING;
+ }
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,68 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * Exception thrown when execution of a remote operation fails for some reason.
- */
-public class RemoteExecutionException extends RemotingException {
-
- private static final long serialVersionUID = 3580395686019440048L;
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with no detail message.
- * The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public RemoteExecutionException() {
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
- * message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public RemoteExecutionException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified cause.
- * The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of
- * <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method)
- */
- public RemoteExecutionException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
- * message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method)
- */
- public RemoteExecutionException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Rethrow the cause, if it is a runtime exception. This is a convenience method to extract a runtime exception
- * from a remote execution exception.
- *
- * @throws RuntimeException the cause
- */
- public final void throwRuntime() throws RuntimeException {
- final Throwable cause = getCause();
- if (cause instanceof RuntimeException) {
- throw ((RuntimeException)cause);
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteExecutionException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,68 @@
+package org.jboss.remoting3;
+
+/**
+ * Exception thrown when execution of a remote operation fails for some reason.
+ */
+public class RemoteExecutionException extends RemotingException {
+
+ private static final long serialVersionUID = 3580395686019440048L;
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with no detail message.
+ * The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public RemoteExecutionException() {
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
+ * message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public RemoteExecutionException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified cause.
+ * The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of
+ * <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method)
+ */
+ public RemoteExecutionException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
+ * message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method)
+ */
+ public RemoteExecutionException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+
+ /**
+ * Rethrow the cause, if it is a runtime exception. This is a convenience method to extract a runtime exception
+ * from a remote execution exception.
+ *
+ * @throws RuntimeException the cause
+ */
+ public final void throwRuntime() throws RuntimeException {
+ final Throwable cause = getCause();
+ if (cause instanceof RuntimeException) {
+ throw ((RuntimeException)cause);
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteReplyException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * An exception indicating that a the remote side tried and failed to send a reply message. The remote side would be
- * aware of this type of failure, so the outcome is determinate; thus it extends {@code RemoteExecutionException}.
- */
-public class RemoteReplyException extends RemoteExecutionException {
-
- private static final long serialVersionUID = -8572480018652753441L;
-
- /**
- * Constructs a <tt>RemoteReplyException</tt> with no detail message. The cause is not initialized, and may subsequently
- * be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public RemoteReplyException() {
- }
-
- /**
- * Constructs a <tt>RemoteReplyException</tt> with the specified detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public RemoteReplyException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemoteReplyException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemoteReplyException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>RemoteReplyException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemoteReplyException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteReplyException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteReplyException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * An exception indicating that a the remote side tried and failed to send a reply message. The remote side would be
+ * aware of this type of failure, so the outcome is determinate; thus it extends {@code RemoteExecutionException}.
+ */
+public class RemoteReplyException extends RemoteExecutionException {
+
+ private static final long serialVersionUID = -8572480018652753441L;
+
+ /**
+ * Constructs a <tt>RemoteReplyException</tt> with no detail message. The cause is not initialized, and may subsequently
+ * be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public RemoteReplyException() {
+ }
+
+ /**
+ * Constructs a <tt>RemoteReplyException</tt> with the specified detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public RemoteReplyException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemoteReplyException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemoteReplyException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemoteReplyException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemoteReplyException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * Remote request exception. Indicates that the request arrived at the remote side, but the handler could not be
- * executed for some reason (for example, the request sent might not be of the correct type).
- */
-public class RemoteRequestException extends RemotingException {
-
- private static final long serialVersionUID = 5494334026096542700L;
-
- /**
- * Constructs a <tt>RemoteRequestException</tt> with no detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public RemoteRequestException() {
- }
-
- /**
- * Constructs a <tt>RemoteRequestException</tt> with the specified detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public RemoteRequestException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemoteRequestException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemoteRequestException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>RemoteRequestException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemoteRequestException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteRequestException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteRequestException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * Remote request exception. Indicates that the request arrived at the remote side, but the handler could not be
+ * executed for some reason (for example, the request sent might not be of the correct type).
+ */
+public class RemoteRequestException extends RemotingException {
+
+ private static final long serialVersionUID = 5494334026096542700L;
+
+ /**
+ * Constructs a <tt>RemoteRequestException</tt> with no detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public RemoteRequestException() {
+ }
+
+ /**
+ * Constructs a <tt>RemoteRequestException</tt> with the specified detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public RemoteRequestException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemoteRequestException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemoteRequestException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemoteRequestException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemoteRequestException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteServiceConfiguration.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import org.jboss.remoting.spi.RequestHandlerSource;
-
-/**
- * A configuration for registering a remote service with an endpoint.
- *
- * @apiviz.exclude
- */
-public final class RemoteServiceConfiguration {
- private String serviceType;
- private String groupName;
- private String endpointName;
- private RequestHandlerSource requestHandlerSource;
- private int metric;
-
- /**
- * Construct a new instance.
- */
- public RemoteServiceConfiguration() {
- }
-
- /**
- * Get the service type.
- *
- * @return the service type
- */
- public String getServiceType() {
- return serviceType;
- }
-
- /**
- * Set the service type.
- *
- * @param serviceType the service type
- */
- public void setServiceType(final String serviceType) {
- this.serviceType = serviceType;
- }
-
- /**
- * Get the service group name.
- *
- * @return the group name
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Set the service group name.
- *
- * @param groupName the group name
- */
- public void setGroupName(final String groupName) {
- this.groupName = groupName;
- }
-
- /**
- * Get the remote endpoint name.
- *
- * @return the remote endpoint name
- */
- public String getEndpointName() {
- return endpointName;
- }
-
- /**
- * Set the remote endpoint name.
- *
- * @param endpointName the remote endpoint name
- */
- public void setEndpointName(final String endpointName) {
- this.endpointName = endpointName;
- }
-
- /**
- * Get the request handler source of the remote service.
- *
- * @return the request handler source
- */
- public RequestHandlerSource getRequestHandlerSource() {
- return requestHandlerSource;
- }
-
- /**
- * Set the request handler source of the remote service.
- *
- * @param requestHandlerSource the request handler source
- */
- public void setRequestHandlerSource(final RequestHandlerSource requestHandlerSource) {
- this.requestHandlerSource = requestHandlerSource;
- }
-
- /**
- * Get the metric of the remote service.
- *
- * @return the metric
- */
- public int getMetric() {
- return metric;
- }
-
- /**
- * Set the metric of the remote service.
- *
- * @param metric the metric
- */
- public void setMetric(final int metric) {
- this.metric = metric;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteServiceConfiguration.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemoteServiceConfiguration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,134 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import org.jboss.remoting3.spi.RequestHandlerSource;
+
+/**
+ * A configuration for registering a remote service with an endpoint.
+ *
+ * @apiviz.exclude
+ */
+public final class RemoteServiceConfiguration {
+ private String serviceType;
+ private String groupName;
+ private String endpointName;
+ private RequestHandlerSource requestHandlerSource;
+ private int metric;
+
+ /**
+ * Construct a new instance.
+ */
+ public RemoteServiceConfiguration() {
+ }
+
+ /**
+ * Get the service type.
+ *
+ * @return the service type
+ */
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ /**
+ * Set the service type.
+ *
+ * @param serviceType the service type
+ */
+ public void setServiceType(final String serviceType) {
+ this.serviceType = serviceType;
+ }
+
+ /**
+ * Get the service group name.
+ *
+ * @return the group name
+ */
+ public String getGroupName() {
+ return groupName;
+ }
+
+ /**
+ * Set the service group name.
+ *
+ * @param groupName the group name
+ */
+ public void setGroupName(final String groupName) {
+ this.groupName = groupName;
+ }
+
+ /**
+ * Get the remote endpoint name.
+ *
+ * @return the remote endpoint name
+ */
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ /**
+ * Set the remote endpoint name.
+ *
+ * @param endpointName the remote endpoint name
+ */
+ public void setEndpointName(final String endpointName) {
+ this.endpointName = endpointName;
+ }
+
+ /**
+ * Get the request handler source of the remote service.
+ *
+ * @return the request handler source
+ */
+ public RequestHandlerSource getRequestHandlerSource() {
+ return requestHandlerSource;
+ }
+
+ /**
+ * Set the request handler source of the remote service.
+ *
+ * @param requestHandlerSource the request handler source
+ */
+ public void setRequestHandlerSource(final RequestHandlerSource requestHandlerSource) {
+ this.requestHandlerSource = requestHandlerSource;
+ }
+
+ /**
+ * Get the metric of the remote service.
+ *
+ * @return the metric
+ */
+ public int getMetric() {
+ return metric;
+ }
+
+ /**
+ * Set the metric of the remote service.
+ *
+ * @param metric the metric
+ */
+ public void setMetric(final int metric) {
+ this.metric = metric;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,183 +0,0 @@
-package org.jboss.remoting;
-
-import java.io.IOException;
-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.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.CloseableExecutor;
-import org.jboss.xnio.log.Logger;
-
-/**
- * The standalone interface into Remoting. This class contains static methods that are useful to standalone programs
- * for managing endpoints and services in a simple fashion.
- *
- * @apiviz.landmark
- */
-public final class Remoting {
-
- private static final Logger log = Logger.getLogger("org.jboss.remoting");
-
- /**
- * Create an endpoint. The endpoint will create its own thread pool with a maximum of 10 threads.
- *
- * @param name the name of the endpoint
- * @return the endpoint
- */
- public static Endpoint createEndpoint(final String name) throws IOException {
- return createEndpoint(name, 10);
- }
-
- /**
- * Create an endpoint. The endpoint will create its own thread pool with a maximum of {@code maxThreads} threads.
- *
- * You must have the {@link org.jboss.remoting.EndpointPermission createEndpoint EndpointPermission} to invoke this method.
- *
- * @param name the name of the endpoint
- * @param maxThreads the maximum thread count
- * @return the endpoint
- */
- public static Endpoint createEndpoint(final String name, final int maxThreads) throws IOException {
- final CloseableExecutor executor = createExecutor(maxThreads);
- final Endpoint endpoint = createEndpoint(executor, name);
- endpoint.addCloseHandler(new CloseHandler<Endpoint>() {
- public void handleClose(final Endpoint closed) {
- IoUtils.safeClose(executor);
- }
- });
- return endpoint;
- }
-
- private static final ThreadFactory OUR_THREAD_FACTORY = new ThreadFactory() {
- private final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
-
- public Thread newThread(final Runnable r) {
- final Thread thread = defaultThreadFactory.newThread(r);
- thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
- public void uncaughtException(final Thread t, final Throwable e) {
- log.error(e, "Uncaught exception in thread %s", t);
- }
- });
- return thread;
- }
- };
-
- /**
- * Create a simple thread pool that is compatible with Remoting. The thread pool will have a maximum of {@code maxThreads}
- * threads.
- *
- * @param maxThreads the maximum thread count
- * @return a closeable executor
- */
- public static CloseableExecutor createExecutor(final int maxThreads) {
- return IoUtils.closeableExecutor(new ThreadPoolExecutor(1, maxThreads, 30L, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(50), OUR_THREAD_FACTORY, new ThreadPoolExecutor.CallerRunsPolicy()), 30L, TimeUnit.SECONDS);
- }
-
- /**
- * Create an endpoint using the given {@code Executor} to execute tasks.
- *
- * @param executor the executor to use
- * @param name the name of the endpoint
- * @return the endpoint
- */
- public static Endpoint createEndpoint(final Executor executor, final String name) throws IOException {
- return new EndpointImpl(executor, name);
- }
-
- /**
- * Create a local client from a request listener. The client will retain the sole reference to the request listener,
- * so when the client is closed, the listener will also be closed (unless the client is sent to a remote endpoint).
- *
- * @param endpoint the endpoint to bind the request listener to
- * @param requestListener the request listener
- * @param requestClass the request class
- * @param replyClass the reply class
- * @param <I> the request type
- * @param <O> the reply type
- * @return a new client
- * @throws IOException if an error occurs
- */
- public static <I, O> Client<I, O> createLocalClient(final Endpoint endpoint, final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(requestListener, requestClass, replyClass);
- try {
- return endpoint.createClient(handle.getResource(), requestClass, replyClass);
- } finally {
- IoUtils.safeClose(handle);
- }
- }
-
- /**
- * Create a local client source from a local service configuration. The client source will be registered on the endpoint.
- *
- * @param endpoint the endpoint to bind the service to
- * @param config the service configuration
- * @param <I> the request type
- * @param <O> the reply type
- * @return a new client source
- * @throws IOException if an error occurs
- */
- public static <I, O> ClientSource<I, O> createLocalClientSource(final Endpoint endpoint, final LocalServiceConfiguration<I, O> config) throws IOException {
- final Handle<RequestHandlerSource> handle = endpoint.registerService(config);
- try {
- return endpoint.createClientSource(handle.getResource(), config.getRequestClass(), config.getReplyClass());
- } finally {
- IoUtils.safeClose(handle);
- }
- }
-
- /**
- * An exception indicating that there was a problem creating an endpoint.
- *
- * @apiviz.exclude
- */
- public static final class EndpointException extends RemotingException {
- private static final long serialVersionUID = -9157350594373125152L;
-
- /**
- * Constructs a <tt>EndpointException</tt> with no detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public EndpointException() {
- }
-
- /**
- * Constructs a <tt>EndpointException</tt> with the specified detail message. The cause is not initialized, and
- * may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public EndpointException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>EndpointException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public EndpointException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>EndpointException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public EndpointException(String msg, Throwable cause) {
- super(msg, cause);
- }
- }
-
- private Remoting() { /* empty */ }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Remoting.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,183 @@
+package org.jboss.remoting3;
+
+import java.io.IOException;
+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.RequestHandler;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.CloseableExecutor;
+import org.jboss.xnio.log.Logger;
+
+/**
+ * The standalone interface into Remoting. This class contains static methods that are useful to standalone programs
+ * for managing endpoints and services in a simple fashion.
+ *
+ * @apiviz.landmark
+ */
+public final class Remoting {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting");
+
+ /**
+ * Create an endpoint. The endpoint will create its own thread pool with a maximum of 10 threads.
+ *
+ * @param name the name of the endpoint
+ * @return the endpoint
+ */
+ public static Endpoint createEndpoint(final String name) throws IOException {
+ return createEndpoint(name, 10);
+ }
+
+ /**
+ * Create an endpoint. The endpoint will create its own thread pool with a maximum of {@code maxThreads} threads.
+ *
+ * You must have the {@link org.jboss.remoting3.EndpointPermission createEndpoint EndpointPermission} to invoke this method.
+ *
+ * @param name the name of the endpoint
+ * @param maxThreads the maximum thread count
+ * @return the endpoint
+ */
+ public static Endpoint createEndpoint(final String name, final int maxThreads) throws IOException {
+ final CloseableExecutor executor = createExecutor(maxThreads);
+ final Endpoint endpoint = createEndpoint(executor, name);
+ endpoint.addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(executor);
+ }
+ });
+ return endpoint;
+ }
+
+ private static final ThreadFactory OUR_THREAD_FACTORY = new ThreadFactory() {
+ private final ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory();
+
+ public Thread newThread(final Runnable r) {
+ final Thread thread = defaultThreadFactory.newThread(r);
+ thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ public void uncaughtException(final Thread t, final Throwable e) {
+ log.error(e, "Uncaught exception in thread %s", t);
+ }
+ });
+ return thread;
+ }
+ };
+
+ /**
+ * Create a simple thread pool that is compatible with Remoting. The thread pool will have a maximum of {@code maxThreads}
+ * threads.
+ *
+ * @param maxThreads the maximum thread count
+ * @return a closeable executor
+ */
+ public static CloseableExecutor createExecutor(final int maxThreads) {
+ return IoUtils.closeableExecutor(new ThreadPoolExecutor(1, maxThreads, 30L, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(50), OUR_THREAD_FACTORY, new ThreadPoolExecutor.CallerRunsPolicy()), 30L, TimeUnit.SECONDS);
+ }
+
+ /**
+ * Create an endpoint using the given {@code Executor} to execute tasks.
+ *
+ * @param executor the executor to use
+ * @param name the name of the endpoint
+ * @return the endpoint
+ */
+ public static Endpoint createEndpoint(final Executor executor, final String name) throws IOException {
+ return new EndpointImpl(executor, name);
+ }
+
+ /**
+ * Create a local client from a request listener. The client will retain the sole reference to the request listener,
+ * so when the client is closed, the listener will also be closed (unless the client is sent to a remote endpoint).
+ *
+ * @param endpoint the endpoint to bind the request listener to
+ * @param requestListener the request listener
+ * @param requestClass the request class
+ * @param replyClass the reply class
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @return a new client
+ * @throws IOException if an error occurs
+ */
+ public static <I, O> Client<I, O> createLocalClient(final Endpoint endpoint, final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(requestListener, requestClass, replyClass);
+ try {
+ return endpoint.createClient(handle.getResource(), requestClass, replyClass);
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ }
+
+ /**
+ * Create a local client source from a local service configuration. The client source will be registered on the endpoint.
+ *
+ * @param endpoint the endpoint to bind the service to
+ * @param config the service configuration
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @return a new client source
+ * @throws IOException if an error occurs
+ */
+ public static <I, O> ClientSource<I, O> createLocalClientSource(final Endpoint endpoint, final LocalServiceConfiguration<I, O> config) throws IOException {
+ final Handle<RequestHandlerSource> handle = endpoint.registerService(config);
+ try {
+ return endpoint.createClientSource(handle.getResource(), config.getRequestClass(), config.getReplyClass());
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ }
+
+ /**
+ * An exception indicating that there was a problem creating an endpoint.
+ *
+ * @apiviz.exclude
+ */
+ public static final class EndpointException extends RemotingException {
+ private static final long serialVersionUID = -9157350594373125152L;
+
+ /**
+ * Constructs a <tt>EndpointException</tt> with no detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public EndpointException() {
+ }
+
+ /**
+ * Constructs a <tt>EndpointException</tt> with the specified detail message. The cause is not initialized, and
+ * may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public EndpointException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>EndpointException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public EndpointException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>EndpointException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public EndpointException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+ }
+
+ private Remoting() { /* empty */ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,52 +0,0 @@
-package org.jboss.remoting;
-
-import java.io.IOException;
-
-/**
- * A general Remoting exception. Used as a base class in order to provide constructors which accept any combination
- * of {@code cause} and {@code message}.
- */
-public abstract class RemotingException extends IOException {
-
- private static final long serialVersionUID = 1540716301579397423L;
-
- /**
- * Constructs a <tt>RemotingException</tt> with no detail message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- protected RemotingException() {
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- protected RemotingException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- protected RemotingException(Throwable cause) {
- initCause(cause);
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- protected RemotingException(String msg, Throwable cause) {
- super(msg);
- initCause(cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RemotingException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,52 @@
+package org.jboss.remoting3;
+
+import java.io.IOException;
+
+/**
+ * A general Remoting exception. Used as a base class in order to provide constructors which accept any combination
+ * of {@code cause} and {@code message}.
+ */
+public abstract class RemotingException extends IOException {
+
+ private static final long serialVersionUID = 1540716301579397423L;
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with no detail message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ protected RemotingException() {
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ protected RemotingException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ protected RemotingException(Throwable cause) {
+ initCause(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ protected RemotingException(String msg, Throwable cause) {
+ super(msg);
+ initCause(cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * An exception type indicating that an operation completed and a reply was received, but it could not be delivered
- * to the client. Possible causes include (but are not limited to) class cast problems and unmarshalling problems.
- */
-public class ReplyException extends RemotingException {
-
- private static final long serialVersionUID = 5562116026829381932L;
-
- /**
- * Constructs a <tt>ReplyException</tt> with no detail message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public ReplyException() {
- }
-
- /**
- * Constructs a <tt>ReplyException</tt> with the specified detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public ReplyException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>ReplyException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public ReplyException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>ReplyException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public ReplyException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ReplyException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * An exception type indicating that an operation completed and a reply was received, but it could not be delivered
+ * to the client. Possible causes include (but are not limited to) class cast problems and unmarshalling problems.
+ */
+public class ReplyException extends RemotingException {
+
+ private static final long serialVersionUID = 5562116026829381932L;
+
+ /**
+ * Constructs a <tt>ReplyException</tt> with no detail message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public ReplyException() {
+ }
+
+ /**
+ * Constructs a <tt>ReplyException</tt> with the specified detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public ReplyException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>ReplyException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public ReplyException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>ReplyException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public ReplyException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,18 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * A handler for request listeners to receive a notification when a request was cancelled.
- *
- * @param <O> the reply type
- *
- * @apiviz.exclude
- */
-public interface RequestCancelHandler<O> {
-
- /**
- * Receive notification that the request was cancelled.
- *
- * @param requestContext the request context
- */
- void notifyCancel(RequestContext<O> requestContext);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestCancelHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,18 @@
+package org.jboss.remoting3;
+
+/**
+ * A handler for request listeners to receive a notification when a request was cancelled.
+ *
+ * @param <O> the reply type
+ *
+ * @apiviz.exclude
+ */
+public interface RequestCancelHandler<O> {
+
+ /**
+ * Receive notification that the request was cancelled.
+ *
+ * @param requestContext the request context
+ */
+ void notifyCancel(RequestContext<O> requestContext);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,81 +0,0 @@
-package org.jboss.remoting;
-
-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
- * specified in this interface.
- *
- * @param <O> the reply type
- *
- * @apiviz.exclude
- */
-public interface RequestContext<O> extends Executor {
- /**
- * Get the context that the request came in on.
- *
- * @return the context
- */
- ClientContext getContext();
-
- /**
- * Determine whether the current request was cancelled.
- *
- * @return {@code true} if the request was cancelled
- */
- boolean isCancelled();
-
- /**
- * Send a reply back to the caller. If transmission fails, an {@code IOException} is thrown from this method
- * and a reply is sent back to the client which will trigger a {@link RemoteReplyException} to be thrown. If the
- * client connection is interrupted in such a way that the reply cannot reach the client, the client will (eventually)
- * receive an {@link IndeterminateOutcomeException}.
- *
- * @param reply the reply to send
- * @throws IOException if the transmission failed
- * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
- */
- void sendReply(O reply) throws IOException, IllegalStateException;
-
- /**
- * Send a failure message back to the caller. If the transmission succeeds, the client will receive a
- * {@link RemoteExecutionException} with the message initialized to {@code msg} and the cause initialized to
- * {@code cause}. If the transmission fails, an {@code IOException} is thrown from this
- * method and the client will (eventually) receive an {@link IndeterminateOutcomeException}.
- *
- * @param msg a message describing the failure, if any (can be {@code null})
- * @param cause the failure cause, if any (can be {@code null})
- *
- * @throws IOException if the transmission failed
- * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
- */
- void sendFailure(String msg, Throwable cause) throws IOException, IllegalStateException;
-
- /**
- * Send a cancellation message back to the client. If the transmission succeeds, the client result will be an
- * acknowledgement of cancellation. If the transmission fails, an {@code IOException} is thrown from this
- * method and the client will (eventually) receive an {@link IndeterminateOutcomeException}.
- *
- * @throws IOException if the message could not be sent (the client could not be notified about the cancellation)
- * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
- */
- void sendCancelled() throws IOException, IllegalStateException;
-
- /**
- * Add a notifier to be called if a cancel request is received. The notifier may be called from the current thread
- * or a different thread. If the request has already been cancelled, the notifier will be called immediately.
- *
- * @param handler the cancel handler
- */
- void addCancelHandler(RequestCancelHandler<O> handler);
-
- /**
- * Execute a task in the context of this request. This method can be used to continue execution of a request. Any
- * tasks submitted to this executor will be interruptible in the event of cancellation.
- *
- * @param command the task to execute
- */
- void execute(Runnable command) throws RejectedExecutionException;
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,81 @@
+package org.jboss.remoting3;
+
+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
+ * specified in this interface.
+ *
+ * @param <O> the reply type
+ *
+ * @apiviz.exclude
+ */
+public interface RequestContext<O> extends Executor {
+ /**
+ * Get the context that the request came in on.
+ *
+ * @return the context
+ */
+ ClientContext getContext();
+
+ /**
+ * Determine whether the current request was cancelled.
+ *
+ * @return {@code true} if the request was cancelled
+ */
+ boolean isCancelled();
+
+ /**
+ * Send a reply back to the caller. If transmission fails, an {@code IOException} is thrown from this method
+ * and a reply is sent back to the client which will trigger a {@link RemoteReplyException} to be thrown. If the
+ * client connection is interrupted in such a way that the reply cannot reach the client, the client will (eventually)
+ * receive an {@link IndeterminateOutcomeException}.
+ *
+ * @param reply the reply to send
+ * @throws IOException if the transmission failed
+ * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
+ */
+ void sendReply(O reply) throws IOException, IllegalStateException;
+
+ /**
+ * Send a failure message back to the caller. If the transmission succeeds, the client will receive a
+ * {@link RemoteExecutionException} with the message initialized to {@code msg} and the cause initialized to
+ * {@code cause}. If the transmission fails, an {@code IOException} is thrown from this
+ * method and the client will (eventually) receive an {@link IndeterminateOutcomeException}.
+ *
+ * @param msg a message describing the failure, if any (can be {@code null})
+ * @param cause the failure cause, if any (can be {@code null})
+ *
+ * @throws IOException if the transmission failed
+ * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
+ */
+ void sendFailure(String msg, Throwable cause) throws IOException, IllegalStateException;
+
+ /**
+ * Send a cancellation message back to the client. If the transmission succeeds, the client result will be an
+ * acknowledgement of cancellation. If the transmission fails, an {@code IOException} is thrown from this
+ * method and the client will (eventually) receive an {@link IndeterminateOutcomeException}.
+ *
+ * @throws IOException if the message could not be sent (the client could not be notified about the cancellation)
+ * @throws IllegalStateException if this or another of the {@code sendXXX()} methods was already invoked for this request
+ */
+ void sendCancelled() throws IOException, IllegalStateException;
+
+ /**
+ * Add a notifier to be called if a cancel request is received. The notifier may be called from the current thread
+ * or a different thread. If the request has already been cancelled, the notifier will be called immediately.
+ *
+ * @param handler the cancel handler
+ */
+ void addCancelHandler(RequestCancelHandler<O> handler);
+
+ /**
+ * Execute a task in the context of this request. This method can be used to continue execution of a request. Any
+ * tasks submitted to this executor will be interruptible in the event of cancellation.
+ *
+ * @param command the task to execute
+ */
+ void execute(Runnable command) throws RejectedExecutionException;
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.jboss.remoting.ClientContext;
-import org.jboss.remoting.IndeterminateOutcomeException;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.RemoteReplyException;
-import org.jboss.remoting.RequestCancelHandler;
-import org.jboss.remoting.RequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.SpiUtils;
-
-/**
- *
- */
-final class RequestContextImpl<O> implements RequestContext<O> {
-
- private final AtomicBoolean closed = new AtomicBoolean();
- private final Object cancelLock = new Object();
- private final ReplyHandler replyHandler;
- private final ClientContextImpl clientContext;
- private final AtomicInteger taskCount = new AtomicInteger();
-
- // @protectedby cancelLock
- private boolean cancelled;
- // @protectedby cancelLock
- private Set<RequestCancelHandler<O>> cancelHandlers;
- private final RequestListenerExecutor interruptingExecutor;
- private final Class<O> replyClass;
-
- RequestContextImpl(final ReplyHandler replyHandler, final ClientContextImpl clientContext, final Class<O> replyClass) {
- this.replyHandler = replyHandler;
- this.clientContext = clientContext;
- this.replyClass = replyClass;
- final Executor executor = clientContext.getExecutor();
- //noinspection ThisEscapedInObjectConstruction
- interruptingExecutor = new RequestListenerExecutor(executor, this);
- }
-
- public ClientContext getContext() {
- return clientContext;
- }
-
- public boolean isCancelled() {
- synchronized (cancelLock) {
- return cancelled;
- }
- }
-
- public void sendReply(final O reply) throws IOException, IllegalStateException {
- if (! closed.getAndSet(true)) {
- final O actualReply;
- try {
- actualReply = replyClass.cast(reply);
- } catch (ClassCastException e) {
- SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply was the wrong type", e));
- throw e;
- }
- try {
- replyHandler.handleReply(actualReply);
- } catch (IOException e) {
- SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply failed", e));
- throw e;
- }
- } else {
- throw new IllegalStateException("Reply already sent");
- }
- }
-
- public void sendFailure(final String msg, final Throwable cause) throws IOException, IllegalStateException {
- if (! closed.getAndSet(true)) {
- replyHandler.handleException(new RemoteExecutionException(msg, cause));
- } else {
- throw new IllegalStateException("Reply already sent");
- }
- }
-
- public void sendCancelled() throws IOException, IllegalStateException {
- if (! closed.getAndSet(true)) {
- try {
- replyHandler.handleCancellation();
- } catch (IOException e) {
- // this is highly unlikely to succeed
- SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote cancellation acknowledgement failed", e));
- }
- } else {
- throw new IllegalStateException("Reply already sent");
- }
- }
-
- public void addCancelHandler(final RequestCancelHandler<O> handler) {
- synchronized (cancelLock) {
- if (cancelled) {
- SpiUtils.safeNotifyCancellation(handler, this);
- } else {
- if (cancelHandlers == null) {
- cancelHandlers = new HashSet<RequestCancelHandler<O>>();
- }
- cancelHandlers.add(handler);
- }
- }
- }
-
- public void execute(final Runnable command) {
- interruptingExecutor.execute(command);
- }
-
- protected void cancel() {
- synchronized (cancelLock) {
- if (! cancelled) {
- cancelled = true;
- if (cancelHandlers != null) {
- for (final RequestCancelHandler<O> handler : cancelHandlers) {
- interruptingExecutor.execute(new Runnable() {
- public void run() {
- SpiUtils.safeNotifyCancellation(handler, RequestContextImpl.this);
- }
- });
- }
- cancelHandlers = null;
- }
- interruptingExecutor.interruptAll();
- }
- }
- }
-
- void startTask() {
- taskCount.incrementAndGet();
- }
-
- void finishTask() {
- if (taskCount.decrementAndGet() == 0 && ! closed.getAndSet(true)) {
- // no response sent! send back IndeterminateOutcomeException
- SpiUtils.safeHandleException(replyHandler, new IndeterminateOutcomeException("No reply was sent by the request listener"));
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+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;
+
+/**
+ *
+ */
+final class RequestContextImpl<O> implements RequestContext<O> {
+
+ private final AtomicBoolean closed = new AtomicBoolean();
+ private final Object cancelLock = new Object();
+ private final ReplyHandler replyHandler;
+ private final ClientContextImpl clientContext;
+ private final AtomicInteger taskCount = new AtomicInteger();
+
+ // @protectedby cancelLock
+ private boolean cancelled;
+ // @protectedby cancelLock
+ private Set<RequestCancelHandler<O>> cancelHandlers;
+ private final RequestListenerExecutor interruptingExecutor;
+ private final Class<O> replyClass;
+
+ RequestContextImpl(final ReplyHandler replyHandler, final ClientContextImpl clientContext, final Class<O> replyClass) {
+ this.replyHandler = replyHandler;
+ this.clientContext = clientContext;
+ this.replyClass = replyClass;
+ final Executor executor = clientContext.getExecutor();
+ //noinspection ThisEscapedInObjectConstruction
+ interruptingExecutor = new RequestListenerExecutor(executor, this);
+ }
+
+ public ClientContext getContext() {
+ return clientContext;
+ }
+
+ public boolean isCancelled() {
+ synchronized (cancelLock) {
+ return cancelled;
+ }
+ }
+
+ public void sendReply(final O reply) throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ final O actualReply;
+ try {
+ actualReply = replyClass.cast(reply);
+ } catch (ClassCastException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply was the wrong type", e));
+ throw e;
+ }
+ try {
+ replyHandler.handleReply(actualReply);
+ } catch (IOException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply failed", e));
+ throw e;
+ }
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void sendFailure(final String msg, final Throwable cause) throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ replyHandler.handleException(new RemoteExecutionException(msg, cause));
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void sendCancelled() throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ try {
+ replyHandler.handleCancellation();
+ } catch (IOException e) {
+ // this is highly unlikely to succeed
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote cancellation acknowledgement failed", e));
+ }
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void addCancelHandler(final RequestCancelHandler<O> handler) {
+ synchronized (cancelLock) {
+ if (cancelled) {
+ SpiUtils.safeNotifyCancellation(handler, this);
+ } else {
+ if (cancelHandlers == null) {
+ cancelHandlers = new HashSet<RequestCancelHandler<O>>();
+ }
+ cancelHandlers.add(handler);
+ }
+ }
+ }
+
+ public void execute(final Runnable command) {
+ interruptingExecutor.execute(command);
+ }
+
+ protected void cancel() {
+ synchronized (cancelLock) {
+ if (! cancelled) {
+ cancelled = true;
+ if (cancelHandlers != null) {
+ for (final RequestCancelHandler<O> handler : cancelHandlers) {
+ interruptingExecutor.execute(new Runnable() {
+ public void run() {
+ SpiUtils.safeNotifyCancellation(handler, RequestContextImpl.this);
+ }
+ });
+ }
+ cancelHandlers = null;
+ }
+ interruptingExecutor.interruptAll();
+ }
+ }
+ }
+
+ void startTask() {
+ taskCount.incrementAndGet();
+ }
+
+ void finishTask() {
+ if (taskCount.decrementAndGet() == 0 && ! closed.getAndSet(true)) {
+ // no response sent! send back IndeterminateOutcomeException
+ SpiUtils.safeHandleException(replyHandler, new IndeterminateOutcomeException("No reply was sent by the request listener"));
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,53 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * A request listener. Implementations of this interface will reply to client requests.
- *
- * @param <I> the request type
- * @param <O> the reply type
- *
- * @apiviz.landmark
- */
-public interface RequestListener<I, O> {
- /**
- * Handle the opening of a client.
- *
- * @param context the client context
- */
- void handleClientOpen(ClientContext context);
-
- /**
- * Handle the opening of a service.
- *
- * @param context the service context
- */
- void handleServiceOpen(ServiceContext context);
-
- /**
- * Handle a request. If this method throws {@code RemoteExecutionException}, then that exception is passed
- * back to the caller and the request is marked as complete. Otherwise, the request
- * listener must send back either a reply (using the {@code sendReply()} method on the {@code RequestContext}) or
- * an exception (using the {@code sendException()} method on the {@code RequestContext}). Failure to do so may
- * cause the client to hang indefinitely.
- *
- * @param context the context on which a reply may be sent
- * @param request the received request
- *
- * @throws RemoteExecutionException if the execution failed in some way
- */
- void handleRequest(RequestContext<O> context, I request) throws RemoteExecutionException;
-
- /**
- * Handle the close of a service.
- *
- * @param context the service context
- */
- void handleServiceClose(ServiceContext context);
-
- /**
- * Handle the close of a client.
- *
- * @param context the client context
- */
- void handleClientClose(ClientContext context);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListener.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,53 @@
+package org.jboss.remoting3;
+
+/**
+ * A request listener. Implementations of this interface will reply to client requests.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ *
+ * @apiviz.landmark
+ */
+public interface RequestListener<I, O> {
+ /**
+ * Handle the opening of a client.
+ *
+ * @param context the client context
+ */
+ void handleClientOpen(ClientContext context);
+
+ /**
+ * Handle the opening of a service.
+ *
+ * @param context the service context
+ */
+ void handleServiceOpen(ServiceContext context);
+
+ /**
+ * Handle a request. If this method throws {@code RemoteExecutionException}, then that exception is passed
+ * back to the caller and the request is marked as complete. Otherwise, the request
+ * listener must send back either a reply (using the {@code sendReply()} method on the {@code RequestContext}) or
+ * an exception (using the {@code sendException()} method on the {@code RequestContext}). Failure to do so may
+ * cause the client to hang indefinitely.
+ *
+ * @param context the context on which a reply may be sent
+ * @param request the received request
+ *
+ * @throws RemoteExecutionException if the execution failed in some way
+ */
+ void handleRequest(RequestContext<O> context, I request) throws RemoteExecutionException;
+
+ /**
+ * Handle the close of a service.
+ *
+ * @param context the service context
+ */
+ void handleServiceClose(ServiceContext context);
+
+ /**
+ * Handle the close of a client.
+ *
+ * @param context the client context
+ */
+ void handleClientClose(ClientContext context);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Executor;
-
-/**
- *
- */
-final class RequestListenerExecutor implements Executor {
-
- private final Set<Task> tasks = Collections.synchronizedSet(new HashSet<Task>());
- private final Executor executor;
- private final RequestContextImpl<?> requestContext;
-
- public RequestListenerExecutor(final Executor executor, final RequestContextImpl<?> context) {
- this.executor = executor;
- requestContext = context;
- }
-
- private final class Task implements Runnable {
- private volatile Thread thread;
- private final Runnable runnable;
-
- private Task(final Runnable runnable) {
- this.runnable = runnable;
- }
-
- public void run() {
- requestContext.startTask();
- thread = Thread.currentThread();
- tasks.add(this);
- try {
- runnable.run();
- } finally {
- requestContext.finishTask();
- tasks.remove(this);
- thread = null;
- }
- }
- }
-
- public void execute(final Runnable command) {
- executor.execute(new Task(command));
- }
-
- public void interruptAll() {
- synchronized (tasks) {
- final Thread currentThread = Thread.currentThread();
- for (Task task : tasks) {
- final Thread thread = task.thread;
- if (thread != null && thread != currentThread) {
- thread.interrupt();
- }
- }
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/RequestListenerExecutor.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Executor;
+
+/**
+ *
+ */
+final class RequestListenerExecutor implements Executor {
+
+ private final Set<Task> tasks = Collections.synchronizedSet(new HashSet<Task>());
+ private final Executor executor;
+ private final RequestContextImpl<?> requestContext;
+
+ public RequestListenerExecutor(final Executor executor, final RequestContextImpl<?> context) {
+ this.executor = executor;
+ requestContext = context;
+ }
+
+ private final class Task implements Runnable {
+ private volatile Thread thread;
+ private final Runnable runnable;
+
+ private Task(final Runnable runnable) {
+ this.runnable = runnable;
+ }
+
+ public void run() {
+ requestContext.startTask();
+ thread = Thread.currentThread();
+ tasks.add(this);
+ try {
+ runnable.run();
+ } finally {
+ requestContext.finishTask();
+ tasks.remove(this);
+ thread = null;
+ }
+ }
+ }
+
+ public void execute(final Runnable command) {
+ executor.execute(new Task(command));
+ }
+
+ public void interruptAll() {
+ synchronized (tasks) {
+ final Thread currentThread = Thread.currentThread();
+ for (Task task : tasks) {
+ final Thread thread = task.thread;
+ if (thread != null && thread != currentThread) {
+ thread.interrupt();
+ }
+ }
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,19 +0,0 @@
-package org.jboss.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * The server-side context of a service. Used to hold state relating to a service (known as a {@code ContextSource} on
- * the client side).
- *
- * @apiviz.exclude
- */
-public interface ServiceContext extends HandleableCloseable<ServiceContext> {
-
- /**
- * Get an attribute map which can be used to cache arbitrary state on the server side.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,19 @@
+package org.jboss.remoting3;
+
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * The server-side context of a service. Used to hold state relating to a service (known as a {@code ContextSource} on
+ * the client side).
+ *
+ * @apiviz.exclude
+ */
+public interface ServiceContext extends HandleableCloseable<ServiceContext> {
+
+ /**
+ * Get an attribute map which can be used to cache arbitrary state on the server side.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import java.util.concurrent.Executor;
-import org.jboss.remoting.ServiceContext;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-final class ServiceContextImpl extends AbstractContextImpl<ServiceContext> implements ServiceContext {
- private static final Logger log = Logger.getLogger("org.jboss.remoting.service-context");
-
- protected ServiceContextImpl(final Executor executor) {
- super(executor);
- }
-
- public String toString() {
- return "service context instance <" + Integer.toHexString(hashCode()) + ">";
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceContextImpl.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import java.util.concurrent.Executor;
+import org.jboss.remoting3.ServiceContext;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ServiceContextImpl extends AbstractContextImpl<ServiceContext> implements ServiceContext {
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.service-context");
+
+ protected ServiceContextImpl(final Executor executor) {
+ super(executor);
+ }
+
+ public String toString() {
+ return "service context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,188 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import org.jboss.remoting.spi.RequestHandlerSource;
-
-/**
- * A listener for watching service registrations on an endpoint.
- *
- * @apiviz.landmark
- */
-public interface ServiceListener {
-
- /**
- * Receive notification that a service was registered.
- *
- * @param listenerHandle the handle to this listener
- * @param info the servce information
- */
- void serviceRegistered(SimpleCloseable listenerHandle, ServiceInfo info);
-
- /**
- * Information about a registered service.
- *
- * @apiviz.exclude
- */
- final class ServiceInfo {
- private String endpointName;
- private String serviceType;
- private String groupName;
- private boolean remote;
- private int metric;
- private RequestHandlerSource requestHandlerSource;
- private SimpleCloseable registrationHandle;
-
- /**
- * Construct a new instance.
- */
- public ServiceInfo() {
- }
-
- /**
- * Get the service type.
- *
- * @return the service type
- */
- public String getServiceType() {
- return serviceType;
- }
-
- /**
- * Set the service type.
- *
- * @param serviceType the service type
- */
- public void setServiceType(final String serviceType) {
- this.serviceType = serviceType;
- }
-
- /**
- * Get the group name.
- *
- * @return the group name
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Set the group name.
- *
- * @param groupName the group name
- */
- public void setGroupName(final String groupName) {
- this.groupName = groupName;
- }
-
- /**
- * Get the metric.
- *
- * @return the metric
- */
- public int getMetric() {
- return metric;
- }
-
- /**
- * Set the metric.
- *
- * @param metric the metric
- */
- public void setMetric(final int metric) {
- this.metric = metric;
- }
-
- /**
- * Get the request handler source.
- *
- * @return the request handler source
- */
- public RequestHandlerSource getRequestHandlerSource() {
- return requestHandlerSource;
- }
-
- /**
- * Set the request handler source.
- *
- * @param requestHandlerSource the request handler source
- */
- public void setRequestHandlerSource(final RequestHandlerSource requestHandlerSource) {
- this.requestHandlerSource = requestHandlerSource;
- }
-
- /**
- * Get the registration handle. Closing this handle will remove the registration.
- *
- * @return the registration handle
- */
- public SimpleCloseable getRegistrationHandle() {
- return registrationHandle;
- }
-
- /**
- * Set the registration handle.
- *
- * @param registrationHandle the registration handle
- */
- public void setRegistrationHandle(final SimpleCloseable registrationHandle) {
- this.registrationHandle = registrationHandle;
- }
-
- /**
- * Get the endpoint name. For local services, this will be the name of the local endpoint.
- *
- * @return the endpoint name
- */
- public String getEndpointName() {
- return endpointName;
- }
-
- /**
- * Set the endpoint name.
- *
- * @param endpointName the endpoint name
- */
- public void setEndpointName(final String endpointName) {
- this.endpointName = endpointName;
- }
-
- /**
- * Determine whether this service is remote.
- *
- * @return {@code true} if this service is remote
- */
- public boolean isRemote() {
- return remote;
- }
-
- /**
- * Specify whether this service is remote.
- *
- * @param remote {@code true} if this service is remote
- */
- public void setRemote(final boolean remote) {
- this.remote = remote;
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,188 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import org.jboss.remoting3.spi.RequestHandlerSource;
+
+/**
+ * A listener for watching service registrations on an endpoint.
+ *
+ * @apiviz.landmark
+ */
+public interface ServiceListener {
+
+ /**
+ * Receive notification that a service was registered.
+ *
+ * @param listenerHandle the handle to this listener
+ * @param info the servce information
+ */
+ void serviceRegistered(SimpleCloseable listenerHandle, ServiceInfo info);
+
+ /**
+ * Information about a registered service.
+ *
+ * @apiviz.exclude
+ */
+ final class ServiceInfo {
+ private String endpointName;
+ private String serviceType;
+ private String groupName;
+ private boolean remote;
+ private int metric;
+ private RequestHandlerSource requestHandlerSource;
+ private SimpleCloseable registrationHandle;
+
+ /**
+ * Construct a new instance.
+ */
+ public ServiceInfo() {
+ }
+
+ /**
+ * Get the service type.
+ *
+ * @return the service type
+ */
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ /**
+ * Set the service type.
+ *
+ * @param serviceType the service type
+ */
+ public void setServiceType(final String serviceType) {
+ this.serviceType = serviceType;
+ }
+
+ /**
+ * Get the group name.
+ *
+ * @return the group name
+ */
+ public String getGroupName() {
+ return groupName;
+ }
+
+ /**
+ * Set the group name.
+ *
+ * @param groupName the group name
+ */
+ public void setGroupName(final String groupName) {
+ this.groupName = groupName;
+ }
+
+ /**
+ * Get the metric.
+ *
+ * @return the metric
+ */
+ public int getMetric() {
+ return metric;
+ }
+
+ /**
+ * Set the metric.
+ *
+ * @param metric the metric
+ */
+ public void setMetric(final int metric) {
+ this.metric = metric;
+ }
+
+ /**
+ * Get the request handler source.
+ *
+ * @return the request handler source
+ */
+ public RequestHandlerSource getRequestHandlerSource() {
+ return requestHandlerSource;
+ }
+
+ /**
+ * Set the request handler source.
+ *
+ * @param requestHandlerSource the request handler source
+ */
+ public void setRequestHandlerSource(final RequestHandlerSource requestHandlerSource) {
+ this.requestHandlerSource = requestHandlerSource;
+ }
+
+ /**
+ * Get the registration handle. Closing this handle will remove the registration.
+ *
+ * @return the registration handle
+ */
+ public SimpleCloseable getRegistrationHandle() {
+ return registrationHandle;
+ }
+
+ /**
+ * Set the registration handle.
+ *
+ * @param registrationHandle the registration handle
+ */
+ public void setRegistrationHandle(final SimpleCloseable registrationHandle) {
+ this.registrationHandle = registrationHandle;
+ }
+
+ /**
+ * Get the endpoint name. For local services, this will be the name of the local endpoint.
+ *
+ * @return the endpoint name
+ */
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ /**
+ * Set the endpoint name.
+ *
+ * @param endpointName the endpoint name
+ */
+ public void setEndpointName(final String endpointName) {
+ this.endpointName = endpointName;
+ }
+
+ /**
+ * Determine whether this service is remote.
+ *
+ * @return {@code true} if this service is remote
+ */
+ public boolean isRemote() {
+ return remote;
+ }
+
+ /**
+ * Specify whether this service is remote.
+ *
+ * @param remote {@code true} if this service is remote
+ */
+ public void setRemote(final boolean remote) {
+ this.remote = remote;
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,95 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import org.jboss.remoting.SimpleCloseable;
-import org.jboss.remoting.spi.RequestHandlerSource;
-
-/**
- *
- */
-final class ServiceRegistration {
- private final boolean remote;
- private final String serviceType;
- private final String groupName;
- private final String endpointName;
- private final int metric;
- private final RequestHandlerSource handlerSource;
- private volatile SimpleCloseable handle;
-
- ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final int metric, final RequestHandlerSource handlerSource) {
- remote = true;
- this.serviceType = serviceType;
- this.groupName = groupName;
- this.endpointName = endpointName;
- this.metric = metric;
- this.handlerSource = handlerSource;
- }
-
- ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final RequestHandlerSource handlerSource) {
- remote = false;
- metric = 0;
- this.serviceType = serviceType;
- this.groupName = groupName;
- this.endpointName = endpointName;
- this.handlerSource = handlerSource;
- }
-
- public boolean matches(final String serviceType, final String groupName, final String endpointName) {
- return (serviceType == null || serviceType.length() == 0 || serviceType.equals(this.serviceType)) &&
- (groupName == null || groupName.length() == 0 || groupName.equals(this.groupName)) &&
- (endpointName == null || endpointName.length() == 0 || endpointName.equals(this.endpointName));
- }
-
- public boolean isRemote() {
- return remote;
- }
-
- public String getServiceType() {
- return serviceType;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public String getEndpointName() {
- return endpointName;
- }
-
- public int getMetric() {
- return metric;
- }
-
- public RequestHandlerSource getHandlerSource() {
- return handlerSource;
- }
-
- public SimpleCloseable getHandle() {
- return handle;
- }
-
- void setHandle(final SimpleCloseable handle) {
- this.handle = handle;
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import org.jboss.remoting3.SimpleCloseable;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+
+/**
+ *
+ */
+final class ServiceRegistration {
+ private final boolean remote;
+ private final String serviceType;
+ private final String groupName;
+ private final String endpointName;
+ private final int metric;
+ private final RequestHandlerSource handlerSource;
+ private volatile SimpleCloseable handle;
+
+ ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final int metric, final RequestHandlerSource handlerSource) {
+ remote = true;
+ this.serviceType = serviceType;
+ this.groupName = groupName;
+ this.endpointName = endpointName;
+ this.metric = metric;
+ this.handlerSource = handlerSource;
+ }
+
+ ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final RequestHandlerSource handlerSource) {
+ remote = false;
+ metric = 0;
+ this.serviceType = serviceType;
+ this.groupName = groupName;
+ this.endpointName = endpointName;
+ this.handlerSource = handlerSource;
+ }
+
+ public boolean matches(final String serviceType, final String groupName, final String endpointName) {
+ return (serviceType == null || serviceType.length() == 0 || serviceType.equals(this.serviceType)) &&
+ (groupName == null || groupName.length() == 0 || groupName.equals(this.groupName)) &&
+ (endpointName == null || endpointName.length() == 0 || endpointName.equals(this.endpointName));
+ }
+
+ public boolean isRemote() {
+ return remote;
+ }
+
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ public int getMetric() {
+ return metric;
+ }
+
+ public RequestHandlerSource getHandlerSource() {
+ return handlerSource;
+ }
+
+ public SimpleCloseable getHandle() {
+ return handle;
+ }
+
+ void setHandle(final SimpleCloseable handle) {
+ this.handle = handle;
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistrationException.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * A service registration exception, thrown when registering a service fails for some reason.
- */
-public class ServiceRegistrationException extends RemotingException {
-
- private static final long serialVersionUID = 6416792968397444648L;
-
- /**
- * Constructs a <tt>ServiceRegistrationException</tt> with no detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public ServiceRegistrationException() {
- }
-
- /**
- * Constructs a <tt>ServiceRegistrationException</tt> with the specified detail message. The cause is not initialized,
- * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public ServiceRegistrationException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>ServiceRegistrationException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public ServiceRegistrationException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>ServiceRegistrationException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public ServiceRegistrationException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistrationException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceRegistrationException.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * A service registration exception, thrown when registering a service fails for some reason.
+ */
+public class ServiceRegistrationException extends RemotingException {
+
+ private static final long serialVersionUID = 6416792968397444648L;
+
+ /**
+ * Constructs a <tt>ServiceRegistrationException</tt> with no detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public ServiceRegistrationException() {
+ }
+
+ /**
+ * Constructs a <tt>ServiceRegistrationException</tt> with the specified detail message. The cause is not initialized,
+ * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public ServiceRegistrationException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>ServiceRegistrationException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public ServiceRegistrationException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>ServiceRegistrationException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public ServiceRegistrationException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceURI.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,133 +0,0 @@
-package org.jboss.remoting;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * A parser for JBoss Remoting URI types.
- *
- * @apiviz.exclude
- */
-public final class ServiceURI {
- public static final String SCHEME = "jrs";
-
- private ServiceURI() {
- }
-
- /**
- * Determine if this URI is a valid Remoting service URI.
- *
- * @param uri the URI
- * @return {@code true} if the given URI is a valid Remoting service URI
- */
- public static boolean isRemotingServiceUri(final URI uri) {
- return SCHEME.equals(uri.getScheme()) && uri.isOpaque();
- }
-
- /**
- * Get the service type from a Remoting service URI.
- *
- * @param uri the URI
- * @return the service type
- * @throws IllegalArgumentException if the given URI is not for a remoting service
- */
- public static String getServiceType(final URI uri) throws IllegalArgumentException {
- if (! isRemotingServiceUri(uri)) {
- throw new IllegalArgumentException("Not a valid remoting service URI");
- }
- final String ssp = uri.getSchemeSpecificPart();
- final int firstColon = ssp.indexOf(':');
- final String serviceType;
- if (firstColon == -1) {
- serviceType = ssp;
- } else {
- serviceType = ssp.substring(0, firstColon);
- }
- return serviceType;
- }
-
- /**
- * Get the group name from a Remoting service URI.
- *
- * @param uri the URI
- * @return the group name
- * @throws IllegalArgumentException if the given URI is not for a remoting service
- */
- public static String getGroupName(final URI uri) throws IllegalArgumentException {
- if (! isRemotingServiceUri(uri)) {
- throw new IllegalArgumentException("Not a valid remoting service URI");
- }
- final String ssp = uri.getSchemeSpecificPart();
- final int firstColon = ssp.indexOf(':');
- final String groupName;
- if (firstColon == -1) {
- return "";
- }
- final int secondColon = ssp.indexOf(':', firstColon + 1);
- if (secondColon == -1) {
- groupName = ssp.substring(firstColon + 1);
- } else {
- groupName = ssp.substring(firstColon + 1, secondColon);
- }
- return groupName;
- }
-
- /**
- * Get the endpoint name from a Remoting service URI.
- *
- * @param uri the URI
- * @return the endpoint name
- * @throws IllegalArgumentException if the given URI is not for a remoting service
- */
- public static String getEndpointName(final URI uri) throws IllegalArgumentException {
- if (! isRemotingServiceUri(uri)) {
- throw new IllegalArgumentException("Not a valid remoting service URI");
- }
- final String ssp = uri.getSchemeSpecificPart();
- final int firstColon = ssp.indexOf(':');
- final String endpointName;
- if (firstColon == -1) {
- return "";
- }
- final int secondColon = ssp.indexOf(':', firstColon + 1);
- if (secondColon == -1) {
- return "";
- }
- // ::: is not officially supported, but this leaves room for extensions
- final int thirdColon = ssp.indexOf(':', secondColon + 1);
- if (thirdColon == -1) {
- endpointName = ssp.substring(secondColon + 1);
- } else {
- endpointName = ssp.substring(secondColon + 1, thirdColon);
- }
- return endpointName;
- }
-
- /**
- * Create a Remoting service URI.
- *
- * @param serviceType the service type, if any
- * @param groupName the group name, if any
- * @param endpointName the endpoint name, if any
- * @return the URI
- */
- public static URI create(String serviceType, String groupName, String endpointName) {
- try {
- StringBuilder builder = new StringBuilder(serviceType.length() + groupName.length() + endpointName.length() + 2);
- if (serviceType != null && serviceType.length() > 0) {
- builder.append(serviceType);
- }
- builder.append(':');
- if (groupName != null && groupName.length() > 0) {
- builder.append(groupName);
- }
- builder.append(':');
- if (endpointName != null && endpointName.length() > 0) {
- builder.append(endpointName);
- }
- return new URI(SCHEME, builder.toString(), null);
- } catch (URISyntaxException e) {
- throw new IllegalStateException("URI syntax exception should not be possible here", e);
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceURI.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/ServiceURI.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,133 @@
+package org.jboss.remoting3;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * A parser for JBoss Remoting URI types.
+ *
+ * @apiviz.exclude
+ */
+public final class ServiceURI {
+ public static final String SCHEME = "jrs";
+
+ private ServiceURI() {
+ }
+
+ /**
+ * Determine if this URI is a valid Remoting service URI.
+ *
+ * @param uri the URI
+ * @return {@code true} if the given URI is a valid Remoting service URI
+ */
+ public static boolean isRemotingServiceUri(final URI uri) {
+ return SCHEME.equals(uri.getScheme()) && uri.isOpaque();
+ }
+
+ /**
+ * Get the service type from a Remoting service URI.
+ *
+ * @param uri the URI
+ * @return the service type
+ * @throws IllegalArgumentException if the given URI is not for a remoting service
+ */
+ public static String getServiceType(final URI uri) throws IllegalArgumentException {
+ if (! isRemotingServiceUri(uri)) {
+ throw new IllegalArgumentException("Not a valid remoting service URI");
+ }
+ final String ssp = uri.getSchemeSpecificPart();
+ final int firstColon = ssp.indexOf(':');
+ final String serviceType;
+ if (firstColon == -1) {
+ serviceType = ssp;
+ } else {
+ serviceType = ssp.substring(0, firstColon);
+ }
+ return serviceType;
+ }
+
+ /**
+ * Get the group name from a Remoting service URI.
+ *
+ * @param uri the URI
+ * @return the group name
+ * @throws IllegalArgumentException if the given URI is not for a remoting service
+ */
+ public static String getGroupName(final URI uri) throws IllegalArgumentException {
+ if (! isRemotingServiceUri(uri)) {
+ throw new IllegalArgumentException("Not a valid remoting service URI");
+ }
+ final String ssp = uri.getSchemeSpecificPart();
+ final int firstColon = ssp.indexOf(':');
+ final String groupName;
+ if (firstColon == -1) {
+ return "";
+ }
+ final int secondColon = ssp.indexOf(':', firstColon + 1);
+ if (secondColon == -1) {
+ groupName = ssp.substring(firstColon + 1);
+ } else {
+ groupName = ssp.substring(firstColon + 1, secondColon);
+ }
+ return groupName;
+ }
+
+ /**
+ * Get the endpoint name from a Remoting service URI.
+ *
+ * @param uri the URI
+ * @return the endpoint name
+ * @throws IllegalArgumentException if the given URI is not for a remoting service
+ */
+ public static String getEndpointName(final URI uri) throws IllegalArgumentException {
+ if (! isRemotingServiceUri(uri)) {
+ throw new IllegalArgumentException("Not a valid remoting service URI");
+ }
+ final String ssp = uri.getSchemeSpecificPart();
+ final int firstColon = ssp.indexOf(':');
+ final String endpointName;
+ if (firstColon == -1) {
+ return "";
+ }
+ final int secondColon = ssp.indexOf(':', firstColon + 1);
+ if (secondColon == -1) {
+ return "";
+ }
+ // ::: is not officially supported, but this leaves room for extensions
+ final int thirdColon = ssp.indexOf(':', secondColon + 1);
+ if (thirdColon == -1) {
+ endpointName = ssp.substring(secondColon + 1);
+ } else {
+ endpointName = ssp.substring(secondColon + 1, thirdColon);
+ }
+ return endpointName;
+ }
+
+ /**
+ * Create a Remoting service URI.
+ *
+ * @param serviceType the service type, if any
+ * @param groupName the group name, if any
+ * @param endpointName the endpoint name, if any
+ * @return the URI
+ */
+ public static URI create(String serviceType, String groupName, String endpointName) {
+ try {
+ StringBuilder builder = new StringBuilder(serviceType.length() + groupName.length() + endpointName.length() + 2);
+ if (serviceType != null && serviceType.length() > 0) {
+ builder.append(serviceType);
+ }
+ builder.append(':');
+ if (groupName != null && groupName.length() > 0) {
+ builder.append(groupName);
+ }
+ builder.append(':');
+ if (endpointName != null && endpointName.length() > 0) {
+ builder.append(endpointName);
+ }
+ return new URI(SCHEME, builder.toString(), null);
+ } catch (URISyntaxException e) {
+ throw new IllegalStateException("URI syntax exception should not be possible here", e);
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-/**
- * A simple close-only handle.
- */
-public interface SimpleCloseable extends HandleableCloseable<SimpleCloseable> {
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/SimpleCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+/**
+ * A simple close-only handle.
+ */
+public interface SimpleCloseable extends HandleableCloseable<SimpleCloseable> {
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Version.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,26 +0,0 @@
-package org.jboss.remoting;
-
-/**
- * The version of Remoting.
- *
- * @apiviz.exclude
- */
-public final class Version {
-
- private Version() {
- }
-
- /**
- * The version.
- */
- public static final String VERSION = "3.1.0.CR1";
-
- /**
- * Print the version to {@code System.out}.
- *
- * @param args ignored
- */
- public static void main(String[] args) {
- System.out.print(VERSION);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/Version.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/Version.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,26 @@
+package org.jboss.remoting3;
+
+/**
+ * The version of Remoting.
+ *
+ * @apiviz.exclude
+ */
+public final class Version {
+
+ private Version() {
+ }
+
+ /**
+ * The version.
+ */
+ public static final String VERSION = "3.1.0.CR1";
+
+ /**
+ * Print the version to {@code System.out}.
+ *
+ * @param args ignored
+ */
+ public static void main(String[] args) {
+ System.out.print(VERSION);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,6 +0,0 @@
-/**
- * The base Remoting 3 API package.
- *
- * @apiviz.exclude org.jboss.remoting.transporter
- */
-package org.jboss.remoting;
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/package-info.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,6 @@
+/**
+ * The base Remoting 3 API package.
+ *
+ * @apiviz.exclude org.jboss.remoting.transporter
+ */
+package org.jboss.remoting3;
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/spi)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractAutoCloseable.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractAutoCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
import java.io.Closeable;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.lang.ref.WeakReference;
-import org.jboss.remoting.RemotingException;
-import org.jboss.remoting.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;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractHandleableCloseable.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
import java.security.AccessController;
@@ -30,9 +30,9 @@
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.HandleableCloseable;
-import org.jboss.remoting.RemotingException;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.HandleableCloseable;
+import org.jboss.remoting3.RemotingException;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractSimpleCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractSimpleCloseable.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AbstractSimpleCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.util.concurrent.Executor;
-import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting3.SimpleCloseable;
/**
* An abstract simple closeable implementation.
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AutoCloseable.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/AutoCloseable.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
-import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting3.HandleableCloseable;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/Handle.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/Handle.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/Handle.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,14 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.HandleableCloseable;
/**
- * A handle to a reference-counted {@link org.jboss.remoting.spi.AutoCloseable AutoCloseable} resource.
+ * A handle to a reference-counted {@link org.jboss.remoting3.spi.AutoCloseable AutoCloseable} resource.
*/
public interface Handle<T> extends HandleableCloseable<Handle<T>> {
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/NamedServiceRegistry.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/NamedServiceRegistry.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -28,9 +28,9 @@
import java.util.Set;
import java.util.Collections;
import java.io.IOException;
-import org.jboss.remoting.ServiceRegistrationException;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.QualifiedName;
+import org.jboss.remoting3.ServiceRegistrationException;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.QualifiedName;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RemoteRequestContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/RemoteRequestContext.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RemoteRequestContext.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
/**
* The context of an outstanding remote request. This instance should be discarded when a reply (of any sort)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/ReplyHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/ReplyHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/ReplyHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/RequestHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
-import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting3.CloseHandler;
/**
* A request handler, which can be passed to remote endpoints. Remote systems can then use the handler
@@ -31,7 +31,7 @@
* <p>
* This is an internal Remoting interface, intended to be implemented only by Remoting internals and protocol implementations.
* It should not be implemented by end-users, as members may be added without notice. Applications should instead use
- * the {@link org.jboss.remoting.Client Client} and {@link org.jboss.remoting.RequestListener RequestListener} interfaces.
+ * the {@link org.jboss.remoting3.Client Client} and {@link org.jboss.remoting3.RequestListener RequestListener} interfaces.
*/
public interface RequestHandler extends AutoCloseable<RequestHandler> {
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandlerSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/RequestHandlerSource.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/RequestHandlerSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.RemotingException;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.RemotingException;
/**
* A request handler source, which can be passed to remote endpoints. Remote systems can then use the handler source
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/SpiUtils.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/SpiUtils.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/SpiUtils.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import java.io.IOException;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.RequestCancelHandler;
-import org.jboss.remoting.RequestContext;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.RequestCancelHandler;
+import org.jboss.remoting3.RequestContext;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/package-info.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/spi/package-info.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -24,4 +24,4 @@
* Service provider classes and interfaces. The classes are basic utility classes as well as abstract base classes
* to ease implementation.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream (from rev 4857, remoting3/trunk/api/src/main/java/org/jboss/remoting/stream)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSink.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSink.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,4 +1,4 @@
-package org.jboss.remoting.stream;
+package org.jboss.remoting3.stream;
import java.io.Closeable;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSource.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/ObjectSource.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,4 +1,4 @@
-package org.jboss.remoting.stream;
+package org.jboss.remoting3.stream;
import java.io.Closeable;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/Streams.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/Streams.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/Streams.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,4 +1,4 @@
-package org.jboss.remoting.stream;
+package org.jboss.remoting3.stream;
import java.io.EOFException;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/package-info.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting3/stream/package-info.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,4 +1,4 @@
/**
* Stream-related API classes.
*/
-package org.jboss.remoting.stream;
+package org.jboss.remoting3.stream;
Modified: remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml
===================================================================
--- remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml 2009-02-26 21:50:42 UTC (rev 4858)
@@ -2,9 +2,9 @@
<classloading name="jboss-remoting-api" version="3.0.0.GA" xmlns="urn:jboss:classloading:1.0">
<capabilities>
- <package name="org.jboss.remoting"/>
- <package name="org.jboss.remoting.spi"/>
- <package name="org.jboss.remoting.stream"/>
+ <package name="org.jboss.remoting3"/>
+ <package name="org.jboss.remoting3.spi"/>
+ <package name="org.jboss.remoting3.stream"/>
</capabilities>
<requirements>
<module name="xnio-api" from-inclusive="true" from="1.2.0.GA" reExport="true"/>
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting3 (from rev 4855, remoting3/trunk/api/src/test/java/org/jboss/remoting)
Deleted: remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java 2009-02-26 18:30:20 UTC (rev 4855)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,277 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting;
-
-import junit.framework.TestCase;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.io.IOException;
-import org.jboss.remoting.AbstractRequestListener;
-import org.jboss.remoting.RequestContext;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.IndeterminateOutcomeException;
-import org.jboss.remoting.test.support.LoggingHelper;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.xnio.IoUtils;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.log.Logger;
-
-/**
- *
- */
-public final class EndpointTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
-
- private static final Logger log = Logger.getLogger(EndpointTestCase.class);
-
- public void testCreate() throws Throwable {
- final ExecutorService executorService = Executors.newCachedThreadPool();
- final EndpointImpl endpoint = new EndpointImpl(executorService, "foo");
- try {
- endpoint.close();
- executorService.shutdown();
- assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
- } finally {
- executorService.shutdownNow();
- }
- }
-
- public void testLocalClientInvoke() throws Throwable {
- final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
- final AtomicBoolean clientClosed = new AtomicBoolean(false);
- final ExecutorService executorService = Executors.newCachedThreadPool();
- try {
- final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
- final Object requestObj = new Object();
- final Object replyObj = new Object();
- try {
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- assertEquals(request, requestObj);
- try {
- context.sendReply(replyObj);
- } catch (IOException e) {
- log.error(e, "Error sending reply!");
- }
- }
- }, Object.class, Object.class);
- try {
- final RequestHandler requestHandler = handle.getResource();
- try {
- requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
- public void handleClose(final RequestHandler closed) {
- clientEndpointClosed.set(true);
- }
- });
- final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
- try {
- client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
- public void handleClose(final Client<Object, Object> closed) {
- clientClosed.set(true);
- }
- });
- handle.close();
- assertEquals(replyObj, client.invoke(requestObj));
- client.close();
- executorService.shutdown();
- assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
- assertTrue(clientEndpointClosed.get());
- assertTrue(clientClosed.get());
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(requestHandler);
- }
- } finally {
- IoUtils.safeClose(handle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- executorService.shutdownNow();
- }
- }
-
- public void testLocalClientSend() throws Throwable {
- final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
- final AtomicBoolean clientClosed = new AtomicBoolean(false);
- final ExecutorService executorService = Executors.newCachedThreadPool();
- try {
- final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
- try {
- final Object requestObj = new Object();
- final Object replyObj = new Object();
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- assertEquals(request, requestObj);
- try {
- context.sendReply(replyObj);
- } catch (IOException e) {
- log.error(e, "Error sending reply!");
- }
- }
- }, Object.class, Object.class);
- try {
- final RequestHandler requestHandler = handle.getResource();
- try {
- requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
- public void handleClose(final RequestHandler closed) {
- clientEndpointClosed.set(true);
- }
- });
- final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
- try {
- client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
- public void handleClose(final Client<Object, Object> closed) {
- clientClosed.set(true);
- }
- });
- handle.close();
- final IoFuture<? extends Object> futureReply = client.send(requestObj);
- assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
- assertEquals(replyObj, futureReply.get());
- client.close();
- executorService.shutdown();
- assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
- assertTrue(clientEndpointClosed.get());
- assertTrue(clientClosed.get());
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(requestHandler);
- }
- } finally {
- IoUtils.safeClose(handle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- executorService.shutdownNow();
- }
- }
-
- public void testUnsentReply() throws Throwable {
- final ExecutorService executorService = Executors.newCachedThreadPool();
- try {
- final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
- try {
- final Object requestObj = new Object();
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- assertEquals(request, requestObj);
- // don't send a reply!!
- }
- }, Object.class, Object.class);
- try {
- final RequestHandler requestHandler = handle.getResource();
- try {
- final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
- try {
- final IoFuture<? extends Object> futureReply = client.send(requestObj);
- assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
- assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(requestHandler);
- }
- } finally {
- IoUtils.safeClose(handle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- executorService.shutdownNow();
- }
- }
-
- public void testUnsentReply2() throws Throwable {
- final ExecutorService executorService = Executors.newCachedThreadPool();
- try {
- final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
- try {
- final Object requestObj = new Object();
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
- public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
- assertEquals(request, requestObj);
- context.execute(new Runnable() {
- public void run() {
- context.execute(new Runnable() {
- public void run() {
- context.execute(new Runnable() {
- public void run() {
- }
- });
- }
- });
- context.execute(new Runnable() {
- public void run() {
- }
- });
- }
- });
- context.execute(new Runnable() {
- public void run() {
- }
- });
- // don't send a reply!!
- }
- }, Object.class, Object.class);
- try {
- final RequestHandler requestHandler = handle.getResource();
- try {
- final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
- try {
- final IoFuture<? extends Object> futureReply = client.send(requestObj);
- assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
- assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
- } finally {
- IoUtils.safeClose(client);
- }
- } finally {
- IoUtils.safeClose(requestHandler);
- }
- } finally {
- IoUtils.safeClose(handle);
- }
- } finally {
- IoUtils.safeClose(endpoint);
- }
- } finally {
- executorService.shutdownNow();
- }
- }
-}
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java (from rev 4857, remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java)
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java (rev 0)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting3/EndpointTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -0,0 +1,273 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3;
+
+import junit.framework.TestCase;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.io.IOException;
+import org.jboss.remoting3.AbstractRequestListener;
+import org.jboss.remoting3.RequestContext;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.IndeterminateOutcomeException;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+public final class EndpointTestCase extends TestCase {
+
+ private static final Logger log = Logger.getLogger(EndpointTestCase.class);
+
+ public void testCreate() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "foo");
+ try {
+ endpoint.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testLocalClientInvoke() throws Throwable {
+ final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
+ final AtomicBoolean clientClosed = new AtomicBoolean(false);
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ final Object requestObj = new Object();
+ final Object replyObj = new Object();
+ try {
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ try {
+ context.sendReply(replyObj);
+ } catch (IOException e) {
+ log.error(e, "Error sending reply!");
+ }
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ clientEndpointClosed.set(true);
+ }
+ });
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
+ public void handleClose(final Client<Object, Object> closed) {
+ clientClosed.set(true);
+ }
+ });
+ handle.close();
+ assertEquals(replyObj, client.invoke(requestObj));
+ client.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ assertTrue(clientEndpointClosed.get());
+ assertTrue(clientClosed.get());
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testLocalClientSend() throws Throwable {
+ final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
+ final AtomicBoolean clientClosed = new AtomicBoolean(false);
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Object replyObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ try {
+ context.sendReply(replyObj);
+ } catch (IOException e) {
+ log.error(e, "Error sending reply!");
+ }
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ clientEndpointClosed.set(true);
+ }
+ });
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
+ public void handleClose(final Client<Object, Object> closed) {
+ clientClosed.set(true);
+ }
+ });
+ handle.close();
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
+ assertEquals(replyObj, futureReply.get());
+ client.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ assertTrue(clientEndpointClosed.get());
+ assertTrue(clientClosed.get());
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testUnsentReply() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ // don't send a reply!!
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
+ assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testUnsentReply2() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ context.execute(new Runnable() {
+ public void run() {
+ context.execute(new Runnable() {
+ public void run() {
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ }
+ });
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ }
+ });
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ // don't send a reply!!
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
+ assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+}
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi (from rev 4857, remoting3/trunk/api/src/test/java/org/jboss/remoting/spi)
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/CloseableTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/CloseableTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import junit.framework.TestCase;
import java.util.concurrent.Executors;
@@ -31,8 +31,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
-import org.jboss.remoting.CloseHandler;
-import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting3.CloseHandler;
+import org.jboss.remoting3.HandleableCloseable;
/**
*
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/NameTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/NameTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting3/spi/NameTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.spi;
+package org.jboss.remoting3.spi;
import junit.framework.TestCase;
-import org.jboss.remoting.QualifiedName;
+import org.jboss.remoting3.QualifiedName;
import java.util.Iterator;
/**
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream (from rev 4857, remoting3/trunk/api/src/test/java/org/jboss/remoting/stream)
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream/StreamsTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting3/stream/StreamsTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.stream;
+package org.jboss.remoting3.stream;
import junit.framework.TestCase;
import java.util.ArrayList;
Copied: remoting3/trunk/compat/src/main/java/org/jboss/remoting3 (from rev 4855, remoting3/trunk/compat/src/main/java/org/jboss/remoting)
Copied: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat (from rev 4857, remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat)
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityClassResolver.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatabilityClassResolver.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityClassResolver.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import org.jboss.marshalling.AbstractClassResolver;
-import org.jboss.remoting.Client;
+import org.jboss.remoting3.Client;
import java.io.IOException;
import java.io.InvalidClassException;
import java.util.Map;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationRequest.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatabilityInvocationRequest.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationRequest.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.io.Serializable;
import java.io.ObjectStreamField;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationResponse.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatabilityInvocationResponse.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatabilityInvocationResponse.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.io.Serializable;
import java.io.ObjectInputStream;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityCallback.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatibilityCallback.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityCallback.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
/**
*
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityClient.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatibilityClient.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityClient.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.io.Externalizable;
import java.io.ObjectOutput;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityHome.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatibilityHome.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityHome.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.io.Serializable;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityInvokerLocator.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/CompatibilityInvokerLocator.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/CompatibilityInvokerLocator.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.net.URI;
import java.io.Serializable;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/Request.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/Request.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/Request.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
import java.util.Map;
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingReplyHandler.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/UnwrappingReplyHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingReplyHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.RemoteExecutionException;
import java.io.IOException;
/**
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingRequestHandler.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/UnwrappingRequestHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/UnwrappingRequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,14 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.remoting.RemoteRequestException;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.remoting3.RemoteRequestException;
import org.jboss.xnio.log.Logger;
import java.util.concurrent.Executor;
import java.util.Map;
@@ -35,7 +35,7 @@
/**
* A request handler which unwraps a Remoting 2-style invocation request to a Remoting 3-style plain object
- * or {@link org.jboss.remoting.compat.Request} instance.
+ * or {@link org.jboss.remoting3.compat.Request} instance.
*/
public final class UnwrappingRequestHandler extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingReplyHandler.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/WrappingReplyHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingReplyHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
-import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.remoting3.spi.ReplyHandler;
import java.io.IOException;
/**
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingRequestHandler.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/WrappingRequestHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/WrappingRequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,16 +20,16 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.compat;
+package org.jboss.remoting3.compat;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
import java.util.concurrent.Executor;
/**
- * A request handler which wraps a Remoting 3-style plain request (or an instance of {@link org.jboss.remoting.compat.Request Request}
+ * A request handler which wraps a Remoting 3-style plain request (or an instance of {@link org.jboss.remoting3.compat.Request Request}
* with a Remoting 2-style invocation request.
*/
public final class WrappingRequestHandler extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
Modified: remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/package-info.java
===================================================================
--- remoting3/trunk/compat/src/main/java/org/jboss/remoting/compat/package-info.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/compat/src/main/java/org/jboss/remoting3/compat/package-info.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -23,4 +23,4 @@
/**
* Classes that represent the Remoting 3 end of a relationship with a legacy Remoting 2 service or client.
*/
-package org.jboss.remoting.compat;
\ No newline at end of file
+package org.jboss.remoting3.compat;
\ No newline at end of file
Copied: remoting3/trunk/samples/src/main/java/org/jboss/remoting3 (from rev 4855, remoting3/trunk/samples/src/main/java/org/jboss/remoting)
Copied: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples (from rev 4857, remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples)
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicConfiguration.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicConfiguration.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicConfiguration.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import org.jboss.marshalling.MarshallerFactory;
import org.jboss.marshalling.MarshallingConfiguration;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicHandlerReplyConsumer.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicHandlerReplyConsumer.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicHandlerReplyConsumer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
@@ -30,11 +30,11 @@
import org.jboss.xnio.channels.StreamChannel;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.ReplyException;
-import org.jboss.remoting.IndeterminateOutcomeException;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.ReplyException;
+import org.jboss.remoting3.IndeterminateOutcomeException;
/**
*
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicProtocol.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicProtocol.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicProtocol.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.Handle;
import org.jboss.xnio.channels.StreamChannel;
import org.jboss.xnio.channels.ChannelOutputStream;
import org.jboss.xnio.channels.ChannelInputStream;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicRequestHandler.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicRequestHandler.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicRequestHandler.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.ReplyHandler;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.SpiUtils;
-import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.ReplyHandler;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.SpiUtils;
+import org.jboss.remoting3.spi.AbstractAutoCloseable;
import org.jboss.marshalling.Marshaller;
import org.jboss.xnio.channels.StreamChannel;
import org.jboss.xnio.IoUtils;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerReplyTransmitter.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicServerReplyTransmitter.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerReplyTransmitter.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import java.util.concurrent.BlockingQueue;
import org.jboss.marshalling.Marshaller;
import org.jboss.xnio.channels.StreamChannel;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
/**
*
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerRequestConsumer.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/BasicServerRequestConsumer.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/BasicServerRequestConsumer.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import org.jboss.marshalling.Unmarshaller;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.RemoteRequestContext;
-import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.ReplyHandler;
import org.jboss.xnio.channels.StreamChannel;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/FutureBasicReply.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/protocol/basic/FutureBasicReply.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/protocol/basic/FutureBasicReply.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import org.jboss.xnio.AbstractIoFuture;
import org.jboss.xnio.IoFuture;
-import org.jboss.remoting.spi.RemoteRequestContext;
+import org.jboss.remoting3.spi.RemoteRequestContext;
import java.io.IOException;
/**
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalBasicExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalBasicExampleMain.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,9 +1,9 @@
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
import java.io.IOException;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.Remoting;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
import org.jboss.xnio.IoUtils;
/**
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalStreamExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/LocalStreamExampleMain.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,12 +1,12 @@
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.Remoting;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
import org.jboss.xnio.IoUtils;
/**
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexClientExample.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/MultiplexClientExample.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexClientExample.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,19 +20,19 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.Remoting;
-import org.jboss.remoting.ClientSource;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.QualifiedName;
-import org.jboss.remoting.multiplex.MultiplexProtocol;
-import org.jboss.remoting.multiplex.MultiplexConfiguration;
-import org.jboss.remoting.multiplex.MultiplexConnection;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
+import org.jboss.remoting3.ClientSource;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.QualifiedName;
+import org.jboss.remoting3.multiplex.MultiplexProtocol;
+import org.jboss.remoting3.multiplex.MultiplexConfiguration;
+import org.jboss.remoting3.multiplex.MultiplexConnection;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.Xnio;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/MultiplexServerExample.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/MultiplexServerExample.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,17 +20,17 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
-import org.jboss.remoting.Remoting;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.LocalServiceConfiguration;
-import org.jboss.remoting.multiplex.MultiplexProtocol;
-import org.jboss.remoting.multiplex.MultiplexConfiguration;
-import org.jboss.remoting.spi.RequestHandlerSource;
-import org.jboss.remoting.spi.Handle;
-import org.jboss.remoting.spi.NamedServiceRegistry;
-import org.jboss.remoting.QualifiedName;
+import org.jboss.remoting3.Remoting;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.LocalServiceConfiguration;
+import org.jboss.remoting3.multiplex.MultiplexProtocol;
+import org.jboss.remoting3.multiplex.MultiplexConfiguration;
+import org.jboss.remoting3.spi.RequestHandlerSource;
+import org.jboss.remoting3.spi.Handle;
+import org.jboss.remoting3.spi.NamedServiceRegistry;
+import org.jboss.remoting3.QualifiedName;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.IoHandlerFactory;
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StreamingRot13RequestListener.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StreamingRot13RequestListener.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StreamingRot13RequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,10 +1,10 @@
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
import java.io.IOException;
import java.io.Reader;
-import org.jboss.remoting.AbstractRequestListener;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.RequestContext;
+import org.jboss.remoting3.AbstractRequestListener;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.RequestContext;
/**
*
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StringRot13RequestListener.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StringRot13RequestListener.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting3/samples/simple/StringRot13RequestListener.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -1,9 +1,9 @@
-package org.jboss.remoting.samples.simple;
+package org.jboss.remoting3.samples.simple;
import java.io.IOException;
-import org.jboss.remoting.AbstractRequestListener;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.RequestContext;
+import org.jboss.remoting3.AbstractRequestListener;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.RequestContext;
import org.jboss.xnio.log.Logger;
/**
Copied: remoting3/trunk/samples/src/test/java/org/jboss/remoting3 (from rev 4855, remoting3/trunk/samples/src/test/java/org/jboss/remoting)
Copied: remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples (from rev 4857, remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples)
Modified: remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java
===================================================================
--- remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples/protocol/basic/BasicTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
+++ remoting3/trunk/samples/src/test/java/org/jboss/remoting3/samples/protocol/basic/BasicTestCase.java 2009-02-26 21:50:42 UTC (rev 4858)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.remoting.samples.protocol.basic;
+package org.jboss.remoting3.samples.protocol.basic;
import junit.framework.TestCase;
import org.jboss.xnio.Xnio;
@@ -30,14 +30,14 @@
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.nio.NioXnio;
import org.jboss.xnio.channels.StreamChannel;
-import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.Remoting;
-import org.jboss.remoting.AbstractRequestListener;
-import org.jboss.remoting.RequestContext;
-import org.jboss.remoting.RemoteExecutionException;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.spi.RequestHandler;
-import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting3.Endpoint;
+import org.jboss.remoting3.Remoting;
+import org.jboss.remoting3.AbstractRequestListener;
+import org.jboss.remoting3.RequestContext;
+import org.jboss.remoting3.RemoteExecutionException;
+import org.jboss.remoting3.Client;
+import org.jboss.remoting3.spi.RequestHandler;
+import org.jboss.remoting3.spi.Handle;
import org.jboss.marshalling.MarshallingConfiguration;
import org.jboss.marshalling.river.RiverMarshallerFactory;
import java.util.concurrent.ThreadPoolExecutor;
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4857 - in remoting3/trunk: api and 4 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 14:52:05 -0500 (Thu, 26 Feb 2009)
New Revision: 4857
Added:
remoting3/trunk/api/pom.xml
remoting3/trunk/pom.xml
Removed:
remoting3/trunk/build.properties
remoting3/trunk/build.xml
Modified:
remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/NameTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java
remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples/protocol/basic/BasicTestCase.java
Log:
Mavenize
Added: remoting3/trunk/api/pom.xml
===================================================================
--- remoting3/trunk/api/pom.xml (rev 0)
+++ remoting3/trunk/api/pom.xml 2009-02-26 19:52:05 UTC (rev 4857)
@@ -0,0 +1,45 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1.0.CR1</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>1.2.0.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.marshalling</groupId>
+ <artifactId>marshalling-api</artifactId>
+ <version>1.0.0.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ <finalName>jboss-remoting</finalName>
+ </build>
+</project>
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
@@ -34,7 +34,6 @@
import org.jboss.remoting.CloseHandler;
import org.jboss.remoting.Client;
import org.jboss.remoting.IndeterminateOutcomeException;
-import org.jboss.remoting.test.support.LoggingHelper;
import org.jboss.remoting.spi.RequestHandler;
import org.jboss.remoting.spi.Handle;
import org.jboss.xnio.IoUtils;
@@ -45,9 +44,6 @@
*
*/
public final class EndpointTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
private static final Logger log = Logger.getLogger(EndpointTestCase.class);
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
@@ -33,15 +33,11 @@
import org.jboss.xnio.log.Logger;
import org.jboss.remoting.CloseHandler;
import org.jboss.remoting.HandleableCloseable;
-import org.jboss.remoting.test.support.LoggingHelper;
/**
*
*/
public final class CloseableTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
public static final Logger log = Logger.getLogger(CloseableTestCase.class);
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/NameTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/NameTestCase.java 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/NameTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
@@ -23,7 +23,6 @@
package org.jboss.remoting.spi;
import junit.framework.TestCase;
-import org.jboss.remoting.test.support.LoggingHelper;
import org.jboss.remoting.QualifiedName;
import java.util.Iterator;
@@ -31,9 +30,6 @@
*
*/
public final class NameTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
public void testParseEmpty() {
boolean ok = false;
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
@@ -28,15 +28,11 @@
import java.util.Arrays;
import java.util.Vector;
import java.io.EOFException;
-import org.jboss.remoting.test.support.LoggingHelper;
/**
*
*/
public final class StreamsTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
public void testCollectionObjectSink() throws Throwable {
final ArrayList<String> strings = new ArrayList<String>();
Deleted: remoting3/trunk/build.properties
===================================================================
--- remoting3/trunk/build.properties 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/build.properties 2009-02-26 19:52:05 UTC (rev 4857)
@@ -1,4 +0,0 @@
-javac.source=1.5
-javac.target=1.5
-
-lib.apiviz.doclet=net.gleamynode.apiviz.APIviz
Deleted: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/build.xml 2009-02-26 19:52:05 UTC (rev 4857)
@@ -1,415 +0,0 @@
-<project name="JBoss Remoting 3" default="all" xmlns:mvn="urn:maven-artifact-ant">
-
- <property file="build.properties.local"/>
- <property file="build.properties"/>
-
- <!-- ============================================== -->
- <!-- LIBRARIES - Keep in alpha order by target name -->
- <!-- ============================================== -->
-
- <property name="maven.ant.file" value="maven-ant-tasks.jar"/>
-
- <target name="jboss.repository" depends="maven-ant">
- <mvn:remoteRepository id="jboss.repository" url="http://repository.jboss.org/maven2"/>
- </target>
-
- <target name="maven-ant.check">
- <available property="maven-ant.exists" file="${maven.ant.file}"/>
- </target>
-
- <target name="maven-ant.fetch" depends="maven-ant.check" unless="maven-ant.exists">
- <get src="http://repository.jboss.org/maven2/org/apache/maven/maven-ant-tasks/2.0.9..." dest="${maven.ant.file}"/>
- </target>
-
- <target name="maven-ant" depends="maven-ant.fetch">
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
- <classpath>
- <pathelement location="${maven.ant.file}"/>
- </classpath>
- </typedef>
- </target>
-
- <!-- External library: apiviz -->
-
- <target name="lib.apiviz" depends="jboss.repository">
- <mvn:dependencies pathId="lib.apiviz.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.apiviz" artifactId="apiviz" version="1.2.5.GA"/>
- </mvn:dependencies>
- </target>
-
- <!-- External library: JUnit -->
-
- <target name="lib.junit" depends="jboss.repository">
- <mvn:dependencies pathId="lib.junit.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="junit" artifactId="junit" version="3.8.2"/>
- </mvn:dependencies>
- <property name="lib.junit.local" refid="lib.junit.classpath"/>
- </target>
-
- <!-- External library: Marshalling API -->
-
- <target name="lib.marshalling-api" depends="jboss.repository">
- <mvn:dependencies pathId="lib.marshalling-api.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.marshalling" artifactId="marshalling-api" version="1.0.0.GA"/>
- </mvn:dependencies>
- <property name="lib.marshalling-api.local" refid="lib.marshalling-api.classpath"/>
- </target>
-
- <!-- External library: Remoting 3 Multiplex -->
-
- <target name="lib.remoting3-multiplex" depends="jboss.repository">
- <mvn:dependencies pathId="lib.river.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.remoting" artifactId="remoting3-multiplex" version="1.0.0.GA"/>
- </mvn:dependencies>
- <property name="lib.remoting3-multiplex.local" refid="lib.remoting3-multiplex.classpath"/>
- </target>
-
- <!-- External library: River -->
-
- <target name="lib.river" depends="jboss.repository">
- <mvn:dependencies pathId="lib.river.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.marshalling" artifactId="river" version="1.0.0.GA"/>
- </mvn:dependencies>
- <property name="lib.river.local" refid="lib.river.classpath"/>
- </target>
-
- <!-- External library: XNIO api -->
-
- <target name="lib.xnio-api" depends="jboss.repository">
- <mvn:dependencies pathId="lib.xnio-api.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-api" version="1.2.0.GA"/>
- </mvn:dependencies>
- <property name="lib.xnio-api.local" refid="lib.xnio-api.classpath"/>
- </target>
-
- <!-- External library: XNIO nio -->
-
- <target name="lib.xnio-nio" depends="jboss.repository">
- <mvn:dependencies pathId="lib.xnio-nio.classpath">
- <mvn:remoteRepository refid="jboss.repository"/>
- <mvn:dependency groupId="org.jboss.xnio" artifactId="xnio-nio" version="1.2.0.GA"/>
- </mvn:dependencies>
- <property name="lib.xnio-nio.local" refid="lib.xnio-nio.classpath"/>
- </target>
-
- <!-- ============================================== -->
- <!-- MODULES - Keep in alpha order by target name -->
- <!-- ============================================== -->
-
- <!-- api module -->
-
- <target name="api.compile.depcheck">
- <mkdir dir="api/target/main"/>
- <uptodate property="api.compile.uptodate" targetfile="api/target/main/.lastcompile">
- <srcfiles dir="api/src/main/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="api.compile" depends="api.compile.depcheck" unless="api.compile.uptodate">
- <mkdir dir="api/target/main/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="api/src/main/java"
- destdir="api/target/main/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="lib.marshalling-api.classpath"/>
- <path refid="lib.xnio-api.classpath"/>
- </classpath>
- </javac>
- <touch file="api/target/main/.lastcompile" verbose="false"/>
- </target>
-
- <target name="api.test.compile.depcheck">
- <mkdir dir="api/target/test"/>
- <uptodate property="api.compile.uptodate" targetfile="api/target/test/.lastcompile">
- <srcfiles dir="api/src/test/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="api.test.compile" depends="lib.junit,api.compile,api.test.compile.depcheck" unless="api.test.compile.uptodate">
- <mkdir dir="api/target/test/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="api/src/test/java"
- destdir="api/target/test/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="api.classpath"/>
- <path refid="testing-support.classpath"/>
- <path refid="lib.junit.classpath"/>
- </classpath>
- </javac>
- <touch file="api/target/test/.lastcompile" verbose="false"/>
- </target>
-
- <target name="api.test.pseudotarget">
- <echo message="============================================="/>
- <echo message="${message}"/>
- <echo message="============================================="/>
- <mkdir dir="api/target/test-results"/>
- <junit printsummary="true" fork="yes" includeantruntime="true">
- <sysproperty key="build.home" value="${basedir}"/>
- <sysproperty key="ant.library.dir" value="${ant.home}/lib"/>
- <sysproperty key="lib.junit.local" value="${lib.junit.local}"/>
- <sysproperty key="lib.marshalling-api.local" value="${lib.marshalling-api.local}"/>
- <sysproperty key="lib.xnio-api.local" value="${lib.xnio-api.local}"/>
- <jvmarg line="${test.jvmargs}"/>
- <formatter type="plain" extension="${extension}"/>
- <classpath>
- <path refid="api.classpath"/>
- <path refid="testing-support.classpath"/>
- <pathelement location="api/target/test/classes"/>
- <path refid="lib.junit.classpath"/>
- </classpath>
- <batchtest fork="yes" todir="api/target/test-results"
- haltonfailure="no">
- <fileset dir="api/target/test/classes">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="api.test" depends="api,testing-support,api.test.compile">
- <antcall inheritall="true" inheritrefs="true" target="api.test.pseudotarget">
- <param name="extension" value=".txt"/>
- <param name="message" value="Running with no security manager"/>
- <param name="test.jvmargs" value="-Ddummy=dummy"/>
- </antcall>
- <antcall inheritall="true" inheritrefs="true" target="api.test.pseudotarget">
- <param name="extension" value="-security.txt"/>
- <param name="message" value="Running with security manager"/>
- <param name="test.jvmargs" value="-Djava.security.manager=org.jboss.remoting.test.support.LoggingSecurityManager -Djava.security.policy=${basedir}/testing-support/src/main/resources/testing.policy"/>
- </antcall>
- </target>
-
- <target name="api.clean">
- <delete dir="api/target"/>
- </target>
-
- <target name="api" description="Build the API module" depends="lib.marshalling-api,lib.xnio-api,api.compile">
- <path id="api.classpath">
- <pathelement location="api/target/main/classes"/>
- <path refid="lib.xnio-api.classpath"/>
- <path refid="lib.marshalling-api.classpath"/>
- </path>
- <java classpathref="api.classpath" classname="org.jboss.remoting.Version" outputproperty="version"/>
- <property name="version" value="UNKNOWN"/>
- </target>
-
- <!-- samples module -->
-
- <target name="samples.compile.depcheck">
- <mkdir dir="samples/target/main"/>
- <uptodate property="samples.compile.uptodate" targetfile="samples/target/main/.lastcompile">
- <srcfiles dir="samples/src/main/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="samples.compile" depends="samples.compile.depcheck" unless="samples.compile.uptodate">
- <mkdir dir="samples/target/main/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="samples/src/main/java"
- destdir="samples/target/main/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="api.classpath"/>
- <path refid="lib.remoting3-multiplex.classpath"/>
- <path refid="lib.river.classpath"/>
- </classpath>
- </javac>
- <touch file="samples/target/main/.lastcompile" verbose="false"/>
- </target>
-
- <target name="samples.clean">
- <delete dir="samples/target"/>
- </target>
-
- <target name="samples" description="Build the samples module" depends="lib.marshalling-api,lib.remoting3-multiplex,lib.river,api,samples.compile">
- <path id="samples.classpath">
- <pathelement location="samples/target/main/classes"/>
- </path>
- </target>
-
- <!-- testing-support module -->
-
- <target name="testing-support.compile.depcheck">
- <mkdir dir="testing-support/target/main"/>
- <uptodate property="testing-support.compile.uptodate" targetfile="testing-support/target/main/.lastcompile">
- <srcfiles dir="testing-support/src/main/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="testing-support.compile" depends="testing-support.compile.depcheck" unless="testing-support.compile.uptodate">
- <mkdir dir="testing-support/target/main/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="testing-support/src/main/java"
- destdir="testing-support/target/main/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="lib.junit.classpath"/>
- <path refid="lib.xnio-api.classpath"/>
- </classpath>
- </javac>
- <touch file="testing-support/target/main/.lastcompile" verbose="false"/>
- </target>
-
- <target name="testing-support.clean">
- <delete dir="testing-support/target"/>
- </target>
-
- <target name="testing-support" description="Build the testing-support module" depends="lib.junit,lib.xnio-api,testing-support.compile">
- <path id="testing-support.classpath">
- <pathelement location="testing-support/target/main/classes"/>
- </path>
- </target>
-
- <!-- ============================================== -->
- <!-- JARS - Keep in alpha order by jar name -->
- <!-- ============================================== -->
-
- <target name="api-jar" description="Build the API JAR" depends="api">
- <delete file="jboss-remoting.jar"/>
- <jar jarfile="jboss-remoting.jar">
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Specification-Title" value="JBoss Remoting"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
- <attribute name="Implementation-Title" value="JBoss Remoting (API)"/>
- <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
- <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
- </manifest>
- <zipfileset dir="api/target/main/classes">
- <include name="**/*.class"/>
- </zipfileset>
- </jar>
- </target>
-
- <target name="api-source-jar" description="Build the API source JAR" depends="api">
- <delete file="jboss-remoting-source.jar"/>
- <jar jarfile="jboss-remoting-source.jar">
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Specification-Title" value="JBoss Remoting Source"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
- <attribute name="Implementation-Title" value="JBoss Remoting Source (API)"/>
- <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
- <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
- </manifest>
- <zipfileset dir="api/src/main/java">
- <include name="**/*.java"/>
- </zipfileset>
- </jar>
- </target>
-
- <!-- ============================================== -->
- <!-- JAVADOCS -->
- <!-- ============================================== -->
-
- <target name="api-javadoc" description="Build the API JavaDoc" depends="api,lib.apiviz,lib.marshalling-api,lib.xnio-api">
- <delete dir="api/target/main/docs"/>
- <mkdir dir="api/target/main/docs"/>
- <javadoc destdir="api/target/main/docs" author="false" version="false" use="false" windowtitle="JBoss Remoting API">
- <doclet name="${lib.apiviz.doclet}" pathref="lib.apiviz.classpath"/>
- <packageset dir="api/src/main/java"/>
- <doctitle><![CDATA[<h1>JBoss Remoting, version ${version}</h1>]]></doctitle>
- <header><![CDATA[JBoss Remoting ${version}]]></header>
- <footer><![CDATA[JBoss Remoting ${version}]]></footer>
- <bottom><![CDATA[<i>Copyright © 2008 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- <link href="http://docs.jboss.org/xnio/1.2.0.GA/api/"/>
- <link href="http://docs.jboss.org/river/1.0.0.GA/api/"/>
- <classpath>
- <path refid="api.classpath"/>
- </classpath>
- </javadoc>
- </target>
-
- <target name="api-javadoc-zip" description="Build the API JavaDoc ZIP" depends="api-javadoc">
- <delete file="jboss-remoting-javadoc.zip"/>
- <zip zipfile="jboss-remoting-javadoc.zip">
- <zipfileset dir="api/target/main/docs" prefix="api">
- <include name="**/*.html"/>
- <include name="**/*.gif"/>
- <include name="**/*.png"/>
- <include name="**/package-list"/>
- </zipfileset>
- </zip>
- </target>
-
- <!-- ============================================== -->
- <!-- Distribution target -->
- <!-- ============================================== -->
-
- <target name="dist" description="Build distribution zip file" depends="api-jar,api-source-jar,api-javadoc-zip">
- <delete file="jboss-remoting.zip"/>
- <zip zipfile="jboss-remoting.zip">
- <zipfileset dir="${basedir}">
- <include name="COPYING.txt"/>
- <include name="jboss-remoting-api.jar"/>
- <include name="jboss-remoting-api-source.jar"/>
- <include name="jboss-remoting-javadoc.zip"/>
- </zipfileset>
- </zip>
- </target>
-
- <!-- Default targets - keep depends in alpha order by category name -->
- <!-- These targets should explicitly list all modules, even if they will be built by other modules -->
-
- <!-- core -->
-
- <!--<target name="all-core" description="Build all core targets" depends="api,core,samples,testing-support"/>-->
- <target name="all-core" description="Build all core targets" depends="api,testing-support"/>
-
- <!-- JARs: These should be the second-to-last targets in the file -->
-
- <target name="all-jars" description="Build all the JARs" depends="api-jar"/>
-
- <!-- all: These should be the last targets in the file -->
-
- <target name="all" description="Build everything" depends="all-core,all-jars,api-javadoc"/>
-
- <target name="clean" description="Clean out all build files" depends="api.clean,samples.clean,testing-support.clean"/>
-
- <target name="test" description="Run all tests" depends="api.test"/>
-
-</project>
Added: remoting3/trunk/pom.xml
===================================================================
--- remoting3/trunk/pom.xml (rev 0)
+++ remoting3/trunk/pom.xml 2009-02-26 19:52:05 UTC (rev 4857)
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting-all</artifactId>
+ <packaging>pom</packaging>
+ <version>1.1.0.CR1</version>
+ <modules>
+ <module>api</module>
+ </modules>
+</project>
Modified: remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples/protocol/basic/BasicTestCase.java
===================================================================
--- remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples/protocol/basic/BasicTestCase.java 2009-02-26 18:46:32 UTC (rev 4856)
+++ remoting3/trunk/samples/src/test/java/org/jboss/remoting/samples/protocol/basic/BasicTestCase.java 2009-02-26 19:52:05 UTC (rev 4857)
@@ -36,7 +36,6 @@
import org.jboss.remoting.RequestContext;
import org.jboss.remoting.RemoteExecutionException;
import org.jboss.remoting.Client;
-import org.jboss.remoting.test.support.LoggingHelper;
import org.jboss.remoting.spi.RequestHandler;
import org.jboss.remoting.spi.Handle;
import org.jboss.marshalling.MarshallingConfiguration;
@@ -51,9 +50,6 @@
*
*/
public final class BasicTestCase extends TestCase {
- static {
- LoggingHelper.init();
- }
public static void testConnect() throws Throwable {
ExecutorService executor = new ThreadPoolExecutor(10, 10, 0L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4856 - remoting3/trunk.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 13:46:32 -0500 (Thu, 26 Feb 2009)
New Revision: 4856
Added:
remoting3/trunk/testing.policy
Removed:
remoting3/trunk/testing-support/
Log:
Remove testing support module (for now, will be replaced with an external artifact (hopefully))
Copied: remoting3/trunk/testing.policy (from rev 4855, remoting3/trunk/testing-support/src/main/resources/testing.policy)
===================================================================
--- remoting3/trunk/testing.policy (rev 0)
+++ remoting3/trunk/testing.policy 2009-02-26 18:46:32 UTC (rev 4856)
@@ -0,0 +1,60 @@
+
+// Permissions for the tests
+
+grant codeBase "file:${build.home}/api/target/test/classes/-"
+{
+ permission java.lang.RuntimePermission "modifyThread"; // for executor control
+ permission org.jboss.remoting.EndpointPermission "createEndpoint";
+ permission org.jboss.remoting.EndpointPermission "createRequestHandler";
+ permission org.jboss.remoting.EndpointPermission "createClient";
+};
+
+// Permissions for Remoting itself
+
+grant codeBase "file:${build.home}/api/target/main/classes/-"
+{
+ permission java.util.PropertyPermission "jboss.remoting.*", "read";
+ permission org.jboss.remoting.EndpointPermission "*";
+};
+
+// Support classes
+
+grant codeBase "file:${build.home}/testing-support/target/main/classes/-"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${idea.home}/lib/idea_rt.jar"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${lib.junit.local}"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${ant.library.dir}/-"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${lib.xnio-api.local}"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${lib.xnio-nio.local}"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${lib.marshalling-api.local}"
+{
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${lib.river.local}"
+{
+ permission java.security.AllPermission;
+};
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4855 - in remoting3/trunk: api/src/main/java/org/jboss/remoting and 2 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 13:30:20 -0500 (Thu, 26 Feb 2009)
New Revision: 4855
Added:
remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java
Removed:
remoting3/trunk/core/
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java
remoting3/trunk/build.xml
remoting3/trunk/testing-support/src/main/resources/testing.policy
Log:
Merge core and api into a single module (since they cannot be separated anyway)
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import org.jboss.remoting.spi.AbstractHandleableCloseable;
+
+/**
+ *
+ */
+abstract class AbstractContextImpl<T> extends AbstractHandleableCloseable<T> {
+
+ private final ConcurrentMap<Object, Object> attributes = new ConcurrentHashMap<Object, Object>();
+
+ AbstractContextImpl(final Executor executor) {
+ super(executor);
+ }
+
+ public ConcurrentMap<Object, Object> getAttributes() {
+ return attributes;
+ }
+
+ protected Executor getExecutor() {
+ return super.getExecutor();
+ }
+
+ protected boolean isOpen() {
+ return super.isOpen();
+ }
+
+ public String toString() {
+ return "generic context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.util.concurrent.Executor;
+import org.jboss.remoting.ClientContext;
+import org.jboss.remoting.ServiceContext;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ClientContextImpl extends AbstractContextImpl<ClientContext> implements ClientContext {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client-context");
+
+ private final ServiceContextImpl serviceContext;
+
+ ClientContextImpl(final Executor executor) {
+ super(executor);
+ serviceContext = null;
+ }
+
+ ClientContextImpl(final ServiceContextImpl serviceContext) {
+ super(serviceContext.getExecutor());
+ this.serviceContext = serviceContext;
+ }
+
+ public ServiceContext getServiceContext() {
+ return serviceContext;
+ }
+
+ public String toString() {
+ return "client context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientExternalizer.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientExternalizer.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.jboss.marshalling.Creator;
+import org.jboss.marshalling.Externalizer;
+import org.jboss.remoting.spi.RequestHandler;
+
+/**
+ *
+ */
+final class ClientExternalizer implements Externalizer {
+
+ private static final long serialVersionUID = 814228455390899997L;
+
+ private final EndpointImpl endpoint;
+
+ ClientExternalizer(final EndpointImpl endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ private static <I, O> void doWriteExternal(final ClientImpl<I, O> client, final ObjectOutput output) throws IOException {
+ output.writeObject(client.getRequestClass());
+ output.writeObject(client.getReplyClass());
+ output.writeObject(client.getRequestHandlerHandle().getResource());
+ }
+
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ doWriteExternal((ClientImpl<?, ?>) o, output);
+ }
+
+ private <I, O> ClientImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandler handler) throws IOException {
+ return ClientImpl.create(handler.getHandle(), endpoint.getExecutor(), requestClass, replyClass);
+ }
+
+ public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final Class<?> requestClass = (Class<?>) input.readObject();
+ final Class<?> replyClass = (Class<?>) input.readObject();
+ final RequestHandler handler = (RequestHandler) input.readObject();
+ return doCreateExternal(requestClass, replyClass, handler);
+ }
+
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // no op
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.IndeterminateOutcomeException;
+import org.jboss.remoting.RemoteRequestException;
+import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting.spi.RemoteRequestContext;
+import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ClientImpl<I, O> extends AbstractContextImpl<Client<I, O>> implements Client<I, O> {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client");
+
+ private final Handle<RequestHandler> handle;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private ClientImpl(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
+ super(executor);
+ this.handle = handle;
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ static <I, O> ClientImpl<I, O> create(final Handle<RequestHandler> handle, final Executor executor, final Class<I> requestClass, final Class<O> replyClass) {
+ final ClientImpl<I, O> ci = new ClientImpl<I, O>(handle, executor, requestClass, replyClass);
+ handle.addCloseHandler(new CloseHandler<Handle<RequestHandler>>() {
+ public void handleClose(final Handle<RequestHandler> closed) {
+ IoUtils.safeClose(ci);
+ }
+ });
+ return ci;
+ }
+
+ protected void closeAction() throws IOException {
+ handle.close();
+ }
+
+ public O invoke(final I request) throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client is not open");
+ }
+ log.trace("Client.invoke() sending request \"%s\"", request);
+ final I actualRequest = castRequest(request);
+ final QueueExecutor executor = new QueueExecutor();
+ final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
+ final ReplyHandler replyHandler = futureReply.getReplyHandler();
+ final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
+ futureReply.setRemoteRequestContext(requestContext);
+ futureReply.addNotifier(IoUtils.<O>attachmentClosingNotifier(), executor);
+ executor.runQueue();
+ try {
+ final O reply = futureReply.getInterruptibly();
+ log.trace("Client.invoke() received reply \"%s\"", reply);
+ return reply;
+ } catch (InterruptedException e) {
+ try {
+ futureReply.cancel();
+ throw new IndeterminateOutcomeException("The current thread was interrupted before the result could be read");
+ } finally {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ public IoFuture<? extends O> send(final I request) throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client is not open");
+ }
+ log.trace("Client.send() sending request \"%s\"", request);
+ final I actualRequest = castRequest(request);
+ final FutureReplyImpl<O> futureReply = new FutureReplyImpl<O>(executor, replyClass);
+ final ReplyHandler replyHandler = futureReply.getReplyHandler();
+ final RemoteRequestContext requestContext = handle.getResource().receiveRequest(actualRequest, replyHandler);
+ futureReply.setRemoteRequestContext(requestContext);
+ return futureReply;
+ }
+
+ /**
+ * Since type is erased, it's possible that the wrong type was passed.
+ * @param request
+ * @return
+ * @throws RemoteRequestException
+ */
+ private I castRequest(final Object request) throws RemoteRequestException {
+ try {
+ return requestClass.cast(request);
+ } catch (ClassCastException e) {
+ throw new RemoteRequestException("Invalid request type sent (got <" + request.getClass().getName() + ">, expected <? extends " + requestClass.getName() + ">");
+ }
+ }
+
+ public String toString() {
+ return "client instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+
+ Handle<RequestHandler> getRequestHandlerHandle() {
+ return handle;
+ }
+
+ Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ Class<O> getReplyClass() {
+ return replyClass;
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceExternalizer.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceExternalizer.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.jboss.marshalling.Creator;
+import org.jboss.marshalling.Externalizer;
+import org.jboss.remoting.spi.RequestHandlerSource;
+
+/**
+ *
+ */
+final class ClientSourceExternalizer implements Externalizer {
+
+ private static final long serialVersionUID = 814228455390899997L;
+
+ private final EndpointImpl endpoint;
+
+ ClientSourceExternalizer(final EndpointImpl endpoint) {
+ this.endpoint = endpoint;
+ }
+
+ private static <I, O> void doWriteExternal(final ClientSourceImpl<I, O> clientSource, final ObjectOutput output) throws IOException {
+ output.writeObject(clientSource.getRequestClass());
+ output.writeObject(clientSource.getReplyClass());
+ output.writeObject(clientSource.getRequestHandlerSourceHandle().getResource());
+ }
+
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ doWriteExternal((ClientSourceImpl<?, ?>) o, output);
+ }
+
+ private <I, O> ClientSourceImpl<I, O> doCreateExternal(Class<I> requestClass, Class<O> replyClass, RequestHandlerSource handlerSource) throws IOException {
+ return ClientSourceImpl.create(handlerSource.getHandle(), endpoint, requestClass, replyClass);
+ }
+
+ public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final Class<?> requestClass = (Class<?>) input.readObject();
+ final Class<?> replyClass = (Class<?>) input.readObject();
+ final RequestHandlerSource handlerSource = (RequestHandlerSource) input.readObject();
+ return doCreateExternal(requestClass, replyClass, handlerSource);
+ }
+
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // no op
+ }
+}
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSourceImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.spi.AbstractHandleableCloseable;
+import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.remoting.spi.RequestHandlerSource;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ClientSourceImpl<I, O> extends AbstractHandleableCloseable<ClientSource<I, O>> implements ClientSource<I, O> {
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.client-source");
+
+ private final Handle<RequestHandlerSource> handle;
+ private final Endpoint endpoint;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private ClientSourceImpl(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
+ super(endpoint.getExecutor());
+ this.handle = handle;
+ this.endpoint = endpoint;
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ static <I, O> ClientSourceImpl<I, O> create(final Handle<RequestHandlerSource> handle, final EndpointImpl endpoint, final Class<I> requestClass, final Class<O> replyClass) {
+ final ClientSourceImpl<I, O> csi = new ClientSourceImpl<I, O>(handle, endpoint, requestClass, replyClass);
+ handle.addCloseHandler(new CloseHandler<Handle<RequestHandlerSource>>() {
+ public void handleClose(final Handle<RequestHandlerSource> closed) {
+ IoUtils.safeClose(csi);
+ }
+ });
+ return csi;
+ }
+
+ protected void closeAction() throws IOException {
+ handle.close();
+ }
+
+ public Client<I, O> createClient() throws IOException {
+ if (! isOpen()) {
+ throw new IOException("Client source is not open");
+ }
+ final Handle<RequestHandler> clientHandle = handle.getResource().createRequestHandler();
+ try {
+ return endpoint.createClient(clientHandle.getResource(), requestClass, replyClass);
+ } finally {
+ IoUtils.safeClose(clientHandle);
+ }
+ }
+
+ public String toString() {
+ return "client source instance <" + Integer.toString(hashCode()) + ">";
+ }
+
+ Handle<RequestHandlerSource> getRequestHandlerSourceHandle() {
+ return handle;
+ }
+
+ Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ Class<O> getReplyClass() {
+ return replyClass;
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ConcurrentReferenceHashMap.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ConcurrentReferenceHashMap.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,1709 @@
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ */
+
+package org.jboss.remoting;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.AbstractCollection;
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.EnumSet;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * An advanced hash table supporting configurable garbage collection semantics
+ * of keys and values, optional referential-equality, full concurrency of
+ * retrievals, and adjustable expected concurrency for updates.
+ *
+ * This table is designed around specific advanced use-cases. If there is any
+ * doubt whether this table is for you, you most likely should be using
+ * {@link java.util.concurrent.ConcurrentHashMap} instead.
+ *
+ * This table supports strong, weak, and soft keys and values. By default keys
+ * are weak, and values are strong. Such a configuration offers similar behavior
+ * to {@link java.util.WeakHashMap}, entries of this table are periodically
+ * removed once their corresponding keys are no longer referenced outside of
+ * this table. In other words, this table will not prevent a key from being
+ * discarded by the garbage collector. Once a key has been discarded by the
+ * collector, the corresponding entry is no longer visible to this table;
+ * however, the entry may occupy space until a future table operation decides to
+ * reclaim it. For this reason, summary functions such as <tt>size</tt> and
+ * <tt>isEmpty</tt> might return a value greater than the observed number of
+ * entries. In order to support a high level of concurrency, stale entries are
+ * only reclaimed during blocking (usually mutating) operations.
+ *
+ * Enabling soft keys allows entries in this table to remain until their space
+ * is absolutely needed by the garbage collector. This is unlike weak keys which
+ * can be reclaimed as soon as they are no longer referenced by a normal strong
+ * reference. The primary use case for soft keys is a cache, which ideally
+ * occupies memory that is not in use for as long as possible.
+ *
+ * By default, values are held using a normal strong reference. This provides
+ * the commonly desired guarantee that a value will always have at least the
+ * same life-span as it's key. For this reason, care should be taken to ensure
+ * that a value never refers, either directly or indirectly, to its key, thereby
+ * preventing reclamation. If this is unavoidable, then it is recommended to use
+ * the same reference type in use for the key. However, it should be noted that
+ * non-strong values may disappear before their corresponding key.
+ *
+ * While this table does allow the use of both strong keys and values, it is
+ * recommended to use {@link java.util.concurrent.ConcurrentHashMap} for such a
+ * configuration, since it is optimized for that case.
+ *
+ * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
+ * the same functional specification as {@link java.util.Hashtable}, and
+ * includes versions of methods corresponding to each method of
+ * <tt>Hashtable</tt>. However, even though all operations are thread-safe,
+ * retrieval operations do <em>not</em> entail locking, and there is
+ * <em>not</em> any support for locking the entire table in a way that
+ * prevents all access. This class is fully interoperable with
+ * <tt>Hashtable</tt> in programs that rely on its thread safety but not on
+ * its synchronization details.
+ *
+ * <p>
+ * Retrieval operations (including <tt>get</tt>) generally do not block, so
+ * may overlap with update operations (including <tt>put</tt> and
+ * <tt>remove</tt>). Retrievals reflect the results of the most recently
+ * <em>completed</em> update operations holding upon their onset. For
+ * aggregate operations such as <tt>putAll</tt> and <tt>clear</tt>,
+ * concurrent retrievals may reflect insertion or removal of only some entries.
+ * Similarly, Iterators and Enumerations return elements reflecting the state of
+ * the hash table at some point at or since the creation of the
+ * iterator/enumeration. They do <em>not</em> throw
+ * {@link ConcurrentModificationException}. However, iterators are designed to
+ * be used by only one thread at a time.
+ *
+ * <p>
+ * The allowed concurrency among update operations is guided by the optional
+ * <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>),
+ * which is used as a hint for internal sizing. The table is internally
+ * partitioned to try to permit the indicated number of concurrent updates
+ * without contention. Because placement in hash tables is essentially random,
+ * the actual concurrency will vary. Ideally, you should choose a value to
+ * accommodate as many threads as will ever concurrently modify the table. Using
+ * a significantly higher value than you need can waste space and time, and a
+ * significantly lower value can lead to thread contention. But overestimates
+ * and underestimates within an order of magnitude do not usually have much
+ * noticeable impact. A value of one is appropriate when it is known that only
+ * one thread will modify and all others will only read. Also, resizing this or
+ * any other kind of hash table is a relatively slow operation, so, when
+ * possible, it is a good idea to provide estimates of expected table sizes in
+ * constructors.
+ *
+ * <p>
+ * This class and its views and iterators implement all of the <em>optional</em>
+ * methods of the {@link Map} and {@link Iterator} interfaces.
+ *
+ * <p>
+ * Like {@link Hashtable} but unlike {@link HashMap}, this class does
+ * <em>not</em> allow <tt>null</tt> to be used as a key or value.
+ *
+ * <p>
+ * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author Doug Lea
+ * @author Jason T. Greene
+ * @param <K> the type of keys maintained by this map
+ * @param <V> the type of mapped values
+ */
+class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
+ implements java.util.concurrent.ConcurrentMap<K, V>, Serializable {
+ private static final long serialVersionUID = 7249069246763182397L;
+
+ /*
+ * The basic strategy is to subdivide the table among Segments,
+ * each of which itself is a concurrently readable hash table.
+ */
+
+ /**
+ * An option specifying which Java reference type should be used to refer
+ * to a key and/or value.
+ */
+ public static enum ReferenceType {
+ /** Indicates a normal Java strong reference should be used */
+ STRONG,
+ /** Indicates a {@link WeakReference} should be used */
+ WEAK,
+ /** Indicates a {@link SoftReference} should be used */
+ SOFT
+ };
+
+
+ public static enum Option {
+ /** Indicates that referential-equality (== instead of .equals()) should
+ * be used when locating keys. This offers similar behavior to {@link IdentityHashMap} */
+ IDENTITY_COMPARISONS
+ };
+
+ /* ---------------- Constants -------------- */
+
+ static final ReferenceType DEFAULT_KEY_TYPE = ReferenceType.WEAK;
+
+ static final ReferenceType DEFAULT_VALUE_TYPE = ReferenceType.STRONG;
+
+
+ /**
+ * The default initial capacity for this table,
+ * used when not otherwise specified in a constructor.
+ */
+ static final int DEFAULT_INITIAL_CAPACITY = 16;
+
+ /**
+ * The default load factor for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+ /**
+ * The default concurrency level for this table, used when not
+ * otherwise specified in a constructor.
+ */
+ static final int DEFAULT_CONCURRENCY_LEVEL = 16;
+
+ /**
+ * The maximum capacity, used if a higher value is implicitly
+ * specified by either of the constructors with arguments. MUST
+ * be a power of two <= 1<<30 to ensure that entries are indexable
+ * using ints.
+ */
+ static final int MAXIMUM_CAPACITY = 1 << 30;
+
+ /**
+ * The maximum number of segments to allow; used to bound
+ * constructor arguments.
+ */
+ static final int MAX_SEGMENTS = 1 << 16; // slightly conservative
+
+ /**
+ * Number of unsynchronized retries in size and containsValue
+ * methods before resorting to locking. This is used to avoid
+ * unbounded retries if tables undergo continuous modification
+ * which would make it impossible to obtain an accurate result.
+ */
+ static final int RETRIES_BEFORE_LOCK = 2;
+
+ /* ---------------- Fields -------------- */
+
+ /**
+ * Mask value for indexing into segments. The upper bits of a
+ * key's hash code are used to choose the segment.
+ */
+ final int segmentMask;
+
+ /**
+ * Shift value for indexing within segments.
+ */
+ final int segmentShift;
+
+ /**
+ * The segments, each of which is a specialized hash table
+ */
+ final Segment<K,V>[] segments;
+
+ boolean identityComparisons;
+
+ transient Set<K> keySet;
+ transient Set<Map.Entry<K,V>> entrySet;
+ transient Collection<V> values;
+
+ /* ---------------- Small Utilities -------------- */
+
+ /**
+ * Applies a supplemental hash function to a given hashCode, which
+ * defends against poor quality hash functions. This is critical
+ * because ConcurrentReferenceHashMap uses power-of-two length hash tables,
+ * that otherwise encounter collisions for hashCodes that do not
+ * differ in lower or upper bits.
+ */
+ private static int hash(int h) {
+ // Spread bits to regularize both segment and index locations,
+ // using variant of single-word Wang/Jenkins hash.
+ h += (h << 15) ^ 0xffffcd7d;
+ h ^= (h >>> 10);
+ h += (h << 3);
+ h ^= (h >>> 6);
+ h += (h << 2) + (h << 14);
+ return h ^ (h >>> 16);
+ }
+
+ /**
+ * Returns the segment that should be used for key with given hash
+ * @param hash the hash code for the key
+ * @return the segment
+ */
+ final Segment<K,V> segmentFor(int hash) {
+ return segments[(hash >>> segmentShift) & segmentMask];
+ }
+
+ private int hashOf(Object key) {
+ return hash(identityComparisons ?
+ System.identityHashCode(key) : key.hashCode());
+ }
+
+ /* ---------------- Inner Classes -------------- */
+
+ static interface KeyReference {
+ int keyHash();
+ Object keyRef();
+ }
+
+ /**
+ * A weak-key reference which stores the key hash needed for reclamation.
+ */
+ static final class WeakKeyReference<K> extends WeakReference<K> implements KeyReference {
+ final int hash;
+ WeakKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return this;
+ }
+ }
+
+ /**
+ * A soft-key reference which stores the key hash needed for reclamation.
+ */
+ static final class SoftKeyReference<K> extends SoftReference<K> implements KeyReference {
+ final int hash;
+ SoftKeyReference(K key, int hash, ReferenceQueue<Object> refQueue) {
+ super(key, refQueue);
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return this;
+ }
+ }
+
+ static final class WeakValueReference<V> extends WeakReference<V> implements KeyReference {
+ final Object keyRef;
+ final int hash;
+ WeakValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
+ super(value, refQueue);
+ this.keyRef = keyRef;
+ this.hash = hash;
+ }
+
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return keyRef;
+ }
+ }
+
+ static final class SoftValueReference<V> extends SoftReference<V> implements KeyReference {
+ final Object keyRef;
+ final int hash;
+ SoftValueReference(V value, Object keyRef, int hash, ReferenceQueue<Object> refQueue) {
+ super(value, refQueue);
+ this.keyRef = keyRef;
+ this.hash = hash;
+ }
+ public final int keyHash() {
+ return hash;
+ }
+
+ public final Object keyRef() {
+ return keyRef;
+ }
+ }
+
+ /**
+ * ConcurrentReferenceHashMap list entry. Note that this is never exported
+ * out as a user-visible Map.Entry.
+ *
+ * Because the value field is volatile, not final, it is legal wrt
+ * the Java Memory Model for an unsynchronized reader to see null
+ * instead of initial value when read via a data race. Although a
+ * reordering leading to this is not likely to ever actually
+ * occur, the Segment.readValueUnderLock method is used as a
+ * backup in case a null (pre-initialized) value is ever seen in
+ * an unsynchronized access method.
+ */
+ static final class HashEntry<K,V> {
+ final Object keyRef;
+ final int hash;
+ volatile Object valueRef;
+ final HashEntry<K,V> next;
+
+ HashEntry(K key, int hash, HashEntry<K,V> next, V value,
+ ReferenceType keyType, ReferenceType valueType,
+ ReferenceQueue<Object> refQueue) {
+ this.hash = hash;
+ this.next = next;
+ this.keyRef = newKeyReference(key, keyType, refQueue);
+ this.valueRef = newValueReference(value, valueType, refQueue);
+ }
+
+ final Object newKeyReference(K key, ReferenceType keyType,
+ ReferenceQueue<Object> refQueue) {
+ if (keyType == ReferenceType.WEAK)
+ return new WeakKeyReference<K>(key, hash, refQueue);
+ if (keyType == ReferenceType.SOFT)
+ return new SoftKeyReference<K>(key, hash, refQueue);
+
+ return key;
+ }
+
+ final Object newValueReference(V value, ReferenceType valueType,
+ ReferenceQueue<Object> refQueue) {
+ if (valueType == ReferenceType.WEAK)
+ return new WeakValueReference<V>(value, keyRef, hash, refQueue);
+ if (valueType == ReferenceType.SOFT)
+ return new SoftValueReference<V>(value, keyRef, hash, refQueue);
+
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ final K key() {
+ if (keyRef instanceof Reference)
+ return ((Reference<K>)keyRef).get();
+
+ return (K) keyRef;
+ }
+
+ final V value() {
+ return dereferenceValue(valueRef);
+ }
+
+ @SuppressWarnings("unchecked")
+ final V dereferenceValue(Object value) {
+ if (value instanceof Reference)
+ return ((Reference<V>)value).get();
+
+ return (V) value;
+ }
+
+ final void setValue(V value, ReferenceType valueType, ReferenceQueue<Object> refQueue) {
+ this.valueRef = newValueReference(value, valueType, refQueue);
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> HashEntry<K,V>[] newArray(int i) {
+ return new HashEntry[i];
+ }
+ }
+
+ /**
+ * Segments are specialized versions of hash tables. This
+ * subclasses from ReentrantLock opportunistically, just to
+ * simplify some locking and avoid separate construction.
+ */
+ static final class Segment<K,V> extends ReentrantLock implements Serializable {
+ /*
+ * Segments maintain a table of entry lists that are ALWAYS
+ * kept in a consistent state, so can be read without locking.
+ * Next fields of nodes are immutable (final). All list
+ * additions are performed at the front of each bin. This
+ * makes it easy to check changes, and also fast to traverse.
+ * When nodes would otherwise be changed, new nodes are
+ * created to replace them. This works well for hash tables
+ * since the bin lists tend to be short. (The average length
+ * is less than two for the default load factor threshold.)
+ *
+ * Read operations can thus proceed without locking, but rely
+ * on selected uses of volatiles to ensure that completed
+ * write operations performed by other threads are
+ * noticed. For most purposes, the "count" field, tracking the
+ * number of elements, serves as that volatile variable
+ * ensuring visibility. This is convenient because this field
+ * needs to be read in many read operations anyway:
+ *
+ * - All (unsynchronized) read operations must first read the
+ * "count" field, and should not look at table entries if
+ * it is 0.
+ *
+ * - All (synchronized) write operations should write to
+ * the "count" field after structurally changing any bin.
+ * The operations must not take any action that could even
+ * momentarily cause a concurrent read operation to see
+ * inconsistent data. This is made easier by the nature of
+ * the read operations in Map. For example, no operation
+ * can reveal that the table has grown but the threshold
+ * has not yet been updated, so there are no atomicity
+ * requirements for this with respect to reads.
+ *
+ * As a guide, all critical volatile reads and writes to the
+ * count field are marked in code comments.
+ */
+
+ private static final long serialVersionUID = 2249069246763182397L;
+
+ /**
+ * The number of elements in this segment's region.
+ */
+ transient volatile int count;
+
+ /**
+ * Number of updates that alter the size of the table. This is
+ * used during bulk-read methods to make sure they see a
+ * consistent snapshot: If modCounts change during a traversal
+ * of segments computing size or checking containsValue, then
+ * we might have an inconsistent view of state so (usually)
+ * must retry.
+ */
+ transient int modCount;
+
+ /**
+ * The table is rehashed when its size exceeds this threshold.
+ * (The value of this field is always <tt>(int)(capacity *
+ * loadFactor)</tt>.)
+ */
+ transient int threshold;
+
+ /**
+ * The per-segment table.
+ */
+ transient volatile HashEntry<K,V>[] table;
+
+ /**
+ * The load factor for the hash table. Even though this value
+ * is same for all segments, it is replicated to avoid needing
+ * links to outer object.
+ * @serial
+ */
+ final float loadFactor;
+
+ /**
+ * The collected weak-key reference queue for this segment.
+ * This should be (re)initialized whenever table is assigned,
+ */
+ transient volatile ReferenceQueue<Object> refQueue;
+
+ final ReferenceType keyType;
+
+ final ReferenceType valueType;
+
+ final boolean identityComparisons;
+
+ Segment(int initialCapacity, float lf, ReferenceType keyType,
+ ReferenceType valueType, boolean identityComparisons) {
+ loadFactor = lf;
+ this.keyType = keyType;
+ this.valueType = valueType;
+ this.identityComparisons = identityComparisons;
+ setTable(HashEntry.<K,V>newArray(initialCapacity));
+ }
+
+ @SuppressWarnings("unchecked")
+ static final <K,V> Segment<K,V>[] newArray(int i) {
+ return new Segment[i];
+ }
+
+ private boolean keyEq(Object src, Object dest) {
+ return identityComparisons ? src == dest : src.equals(dest);
+ }
+
+ /**
+ * Sets table to new HashEntry array.
+ * Call only while holding lock or in constructor.
+ */
+ void setTable(HashEntry<K,V>[] newTable) {
+ threshold = (int)(newTable.length * loadFactor);
+ table = newTable;
+ refQueue = new ReferenceQueue<Object>();
+ }
+
+ /**
+ * Returns properly casted first entry of bin for given hash.
+ */
+ HashEntry<K,V> getFirst(int hash) {
+ HashEntry<K,V>[] tab = table;
+ return tab[hash & (tab.length - 1)];
+ }
+
+ HashEntry<K,V> newHashEntry(K key, int hash, HashEntry<K, V> next, V value) {
+ return new HashEntry<K,V>(key, hash, next, value, keyType, valueType, refQueue);
+ }
+
+ /**
+ * Reads value field of an entry under lock. Called if value
+ * field ever appears to be null. This is possible only if a
+ * compiler happens to reorder a HashEntry initialization with
+ * its table assignment, which is legal under memory model
+ * but is not known to ever occur.
+ */
+ V readValueUnderLock(HashEntry<K,V> e) {
+ lock();
+ try {
+ removeStale();
+ return e.value();
+ } finally {
+ unlock();
+ }
+ }
+
+ /* Specialized implementations of map methods */
+
+ V get(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key())) {
+ Object opaque = e.valueRef;
+ if (opaque != null)
+ return e.dereferenceValue(opaque);
+
+ return readValueUnderLock(e); // recheck
+ }
+ e = e.next;
+ }
+ }
+ return null;
+ }
+
+ boolean containsKey(Object key, int hash) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null) {
+ if (e.hash == hash && keyEq(key, e.key()))
+ return true;
+ e = e.next;
+ }
+ }
+ return false;
+ }
+
+ boolean containsValue(Object value) {
+ if (count != 0) { // read-volatile
+ HashEntry<K,V>[] tab = table;
+ int len = tab.length;
+ for (int i = 0 ; i < len; i++) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ Object opaque = e.valueRef;
+ V v;
+
+ if (opaque == null)
+ v = readValueUnderLock(e); // recheck
+ else
+ v = e.dereferenceValue(opaque);
+
+ if (value.equals(v))
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ boolean replace(K key, int hash, V oldValue, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ boolean replaced = false;
+ if (e != null && oldValue.equals(e.value())) {
+ replaced = true;
+ e.setValue(newValue, valueType, refQueue);
+ }
+ return replaced;
+ } finally {
+ unlock();
+ }
+ }
+
+ V replace(K key, int hash, V newValue) {
+ lock();
+ try {
+ removeStale();
+ HashEntry<K,V> e = getFirst(hash);
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ oldValue = e.value();
+ e.setValue(newValue, valueType, refQueue);
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+
+ V put(K key, int hash, V value, boolean onlyIfAbsent) {
+ lock();
+ try {
+ removeStale();
+ int c = count;
+ if (c++ > threshold) {// ensure capacity
+ int reduced = rehash();
+ if (reduced > 0) // adjust from possible weak cleanups
+ count = (c -= reduced) - 1; // write-volatile
+ }
+
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ while (e != null && (e.hash != hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue;
+ if (e != null) {
+ oldValue = e.value();
+ if (!onlyIfAbsent)
+ e.setValue(value, valueType, refQueue);
+ }
+ else {
+ oldValue = null;
+ ++modCount;
+ tab[index] = newHashEntry(key, hash, first, value);
+ count = c; // write-volatile
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ int rehash() {
+ HashEntry<K,V>[] oldTable = table;
+ int oldCapacity = oldTable.length;
+ if (oldCapacity >= MAXIMUM_CAPACITY)
+ return 0;
+
+ /*
+ * Reclassify nodes in each list to new Map. Because we are
+ * using power-of-two expansion, the elements from each bin
+ * must either stay at same index, or move with a power of two
+ * offset. We eliminate unnecessary node creation by catching
+ * cases where old nodes can be reused because their next
+ * fields won't change. Statistically, at the default
+ * threshold, only about one-sixth of them need cloning when
+ * a table doubles. The nodes they replace will be garbage
+ * collectable as soon as they are no longer referenced by any
+ * reader thread that may be in the midst of traversing table
+ * right now.
+ */
+
+ HashEntry<K,V>[] newTable = HashEntry.newArray(oldCapacity<<1);
+ threshold = (int)(newTable.length * loadFactor);
+ int sizeMask = newTable.length - 1;
+ int reduce = 0;
+ for (int i = 0; i < oldCapacity ; i++) {
+ // We need to guarantee that any existing reads of old Map can
+ // proceed. So we cannot yet null out each bin.
+ HashEntry<K,V> e = oldTable[i];
+
+ if (e != null) {
+ HashEntry<K,V> next = e.next;
+ int idx = e.hash & sizeMask;
+
+ // Single node on list
+ if (next == null)
+ newTable[idx] = e;
+
+ else {
+ // Reuse trailing consecutive sequence at same slot
+ HashEntry<K,V> lastRun = e;
+ int lastIdx = idx;
+ for (HashEntry<K,V> last = next;
+ last != null;
+ last = last.next) {
+ int k = last.hash & sizeMask;
+ if (k != lastIdx) {
+ lastIdx = k;
+ lastRun = last;
+ }
+ }
+ newTable[lastIdx] = lastRun;
+ // Clone all remaining nodes
+ for (HashEntry<K,V> p = e; p != lastRun; p = p.next) {
+ // Skip GC'd weak refs
+ K key = p.key();
+ if (key == null) {
+ reduce++;
+ continue;
+ }
+ int k = p.hash & sizeMask;
+ HashEntry<K,V> n = newTable[k];
+ newTable[k] = newHashEntry(key, p.hash, n, p.value());
+ }
+ }
+ }
+ }
+ table = newTable;
+ return reduce;
+ }
+
+ /**
+ * Remove; match on key only if value null, else match both.
+ */
+ V remove(Object key, int hash, Object value, boolean refRemove) {
+ lock();
+ try {
+ if (!refRemove)
+ removeStale();
+ int c = count - 1;
+ HashEntry<K,V>[] tab = table;
+ int index = hash & (tab.length - 1);
+ HashEntry<K,V> first = tab[index];
+ HashEntry<K,V> e = first;
+ // a ref remove operation compares the Reference instance
+ while (e != null && key != e.keyRef
+ && (refRemove || hash != e.hash || !keyEq(key, e.key())))
+ e = e.next;
+
+ V oldValue = null;
+ if (e != null) {
+ V v = e.value();
+ if (value == null || value.equals(v)) {
+ oldValue = v;
+ // All entries following removed node can stay
+ // in list, but all preceding ones need to be
+ // cloned.
+ ++modCount;
+ HashEntry<K,V> newFirst = e.next;
+ for (HashEntry<K,V> p = first; p != e; p = p.next) {
+ K pKey = p.key();
+ if (pKey == null) { // Skip GC'd keys
+ c--;
+ continue;
+ }
+
+ newFirst = newHashEntry(pKey, p.hash, newFirst, p.value());
+ }
+ tab[index] = newFirst;
+ count = c; // write-volatile
+ }
+ }
+ return oldValue;
+ } finally {
+ unlock();
+ }
+ }
+
+ final void removeStale() {
+ KeyReference ref;
+ while ((ref = (KeyReference) refQueue.poll()) != null) {
+ remove(ref.keyRef(), ref.keyHash(), null, true);
+ }
+ }
+
+ void clear() {
+ if (count != 0) {
+ lock();
+ try {
+ HashEntry<K,V>[] tab = table;
+ for (int i = 0; i < tab.length ; i++)
+ tab[i] = null;
+ ++modCount;
+ // replace the reference queue to avoid unnecessary stale cleanups
+ refQueue = new ReferenceQueue<Object>();
+ count = 0; // write-volatile
+ } finally {
+ unlock();
+ }
+ }
+ }
+ }
+
+
+
+ /* ---------------- Public operations -------------- */
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, reference types, load factor and concurrency level.
+ *
+ * Behavioral changing options such as {@link Option#IDENTITY_COMPARISONS}
+ * can also be specified.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @param options the behavioral options
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel,
+ ReferenceType keyType, ReferenceType valueType,
+ EnumSet<Option> options) {
+ if (!(loadFactor > 0) || initialCapacity < 0 || concurrencyLevel <= 0)
+ throw new IllegalArgumentException();
+
+ if (concurrencyLevel > MAX_SEGMENTS)
+ concurrencyLevel = MAX_SEGMENTS;
+
+ // Find power-of-two sizes best matching arguments
+ int sshift = 0;
+ int ssize = 1;
+ while (ssize < concurrencyLevel) {
+ ++sshift;
+ ssize <<= 1;
+ }
+ segmentShift = 32 - sshift;
+ segmentMask = ssize - 1;
+ this.segments = Segment.newArray(ssize);
+
+ if (initialCapacity > MAXIMUM_CAPACITY)
+ initialCapacity = MAXIMUM_CAPACITY;
+ int c = initialCapacity / ssize;
+ if (c * ssize < initialCapacity)
+ ++c;
+ int cap = 1;
+ while (cap < c)
+ cap <<= 1;
+
+ identityComparisons = options != null && options.contains(Option.IDENTITY_COMPARISONS);
+
+ for (int i = 0; i < this.segments.length; ++i)
+ this.segments[i] = new Segment<K,V>(cap, loadFactor,
+ keyType, valueType, identityComparisons);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial
+ * capacity, load factor and concurrency level.
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @param concurrencyLevel the estimated number of concurrently
+ * updating threads. The implementation performs internal sizing
+ * to try to accommodate this many threads.
+ * @throws IllegalArgumentException if the initial capacity is
+ * negative or the load factor or concurrencyLevel are
+ * nonpositive.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ float loadFactor, int concurrencyLevel) {
+ this(initialCapacity, loadFactor, concurrencyLevel,
+ DEFAULT_KEY_TYPE, DEFAULT_VALUE_TYPE, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity
+ * and load factor and with the default reference types (weak keys,
+ * strong values), and concurrencyLevel (16).
+ *
+ * @param initialCapacity The implementation performs internal
+ * sizing to accommodate this many elements.
+ * @param loadFactor the load factor threshold, used to control resizing.
+ * Resizing may be performed when the average number of elements per
+ * bin exceeds this threshold.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative or the load factor is nonpositive
+ *
+ * @since 1.6
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity, float loadFactor) {
+ this(initialCapacity, loadFactor, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * reference types and with default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @param keyType the reference type to use for keys
+ * @param valueType the reference type to use for values
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity,
+ ReferenceType keyType, ReferenceType valueType) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
+ keyType, valueType, null);
+ }
+
+ /**
+ * Creates a new, empty map with the specified initial capacity,
+ * and with default reference types (weak keys, strong values),
+ * load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param initialCapacity the initial capacity. The implementation
+ * performs internal sizing to accommodate this many elements.
+ * @throws IllegalArgumentException if the initial capacity of
+ * elements is negative.
+ */
+ public ConcurrentReferenceHashMap(int initialCapacity) {
+ this(initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new, empty map with a default initial capacity (16),
+ * reference types (weak keys, strong values), default
+ * load factor (0.75) and concurrencyLevel (16).
+ */
+ public ConcurrentReferenceHashMap() {
+ this(DEFAULT_INITIAL_CAPACITY, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ }
+
+ /**
+ * Creates a new map with the same mappings as the given map.
+ * The map is created with a capacity of 1.5 times the number
+ * of mappings in the given map or 16 (whichever is greater),
+ * and a default load factor (0.75) and concurrencyLevel (16).
+ *
+ * @param m the map
+ */
+ public ConcurrentReferenceHashMap(Map<? extends K, ? extends V> m) {
+ this(Math.max((int) (m.size() / DEFAULT_LOAD_FACTOR) + 1,
+ DEFAULT_INITIAL_CAPACITY),
+ DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL);
+ putAll(m);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map contains no key-value mappings.
+ *
+ * @return <tt>true</tt> if this map contains no key-value mappings
+ */
+ public boolean isEmpty() {
+ final Segment<K,V>[] segments = this.segments;
+ /*
+ * We keep track of per-segment modCounts to avoid ABA
+ * problems in which an element in one segment was added and
+ * in another removed during traversal, in which case the
+ * table was never actually empty at any point. Note the
+ * similar use of modCounts in the size() and containsValue()
+ * methods, which are the only other methods also susceptible
+ * to ABA problems.
+ */
+ int[] mc = new int[segments.length];
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0)
+ return false;
+ else
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ // If mcsum happens to be zero, then we know we got a snapshot
+ // before any modifications at all were made. This is
+ // probably common enough to bother tracking.
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].count != 0 ||
+ mc[i] != segments[i].modCount)
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Returns the number of key-value mappings in this map. If the
+ * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
+ * <tt>Integer.MAX_VALUE</tt>.
+ *
+ * @return the number of key-value mappings in this map
+ */
+ public int size() {
+ final Segment<K,V>[] segments = this.segments;
+ long sum = 0;
+ long check = 0;
+ int[] mc = new int[segments.length];
+ // Try a few times to get accurate count. On failure due to
+ // continuous async changes in table, resort to locking.
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ check = 0;
+ sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ sum += segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ }
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ check += segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ check = -1; // force retry
+ break;
+ }
+ }
+ }
+ if (check == sum)
+ break;
+ }
+ if (check != sum) { // Resort to locking all segments
+ sum = 0;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ for (int i = 0; i < segments.length; ++i)
+ sum += segments[i].count;
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ if (sum > Integer.MAX_VALUE)
+ return Integer.MAX_VALUE;
+ else
+ return (int)sum;
+ }
+
+ /**
+ * Returns the value to which the specified key is mapped,
+ * or {@code null} if this map contains no mapping for the key.
+ *
+ * <p>More formally, if this map contains a mapping from a key
+ * {@code k} to a value {@code v} such that {@code key.equals(k)},
+ * then this method returns {@code v}; otherwise it returns
+ * {@code null}. (There can be at most one such mapping.)
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public V get(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).get(key, hash);
+ }
+
+ /**
+ * Tests if the specified object is a key in this table.
+ *
+ * @param key possible key
+ * @return <tt>true</tt> if and only if the specified object
+ * is a key in this table, as determined by the
+ * <tt>equals</tt> method; <tt>false</tt> otherwise.
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean containsKey(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).containsKey(key, hash);
+ }
+
+ /**
+ * Returns <tt>true</tt> if this map maps one or more keys to the
+ * specified value. Note: This method requires a full internal
+ * traversal of the hash table, and so is much slower than
+ * method <tt>containsKey</tt>.
+ *
+ * @param value value whose presence in this map is to be tested
+ * @return <tt>true</tt> if this map maps one or more keys to the
+ * specified value
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean containsValue(Object value) {
+ if (value == null)
+ throw new NullPointerException();
+
+ // See explanation of modCount use above
+
+ final Segment<K,V>[] segments = this.segments;
+ int[] mc = new int[segments.length];
+
+ // Try a few times without locking
+ for (int k = 0; k < RETRIES_BEFORE_LOCK; ++k) {
+ int sum = 0;
+ int mcsum = 0;
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ mcsum += mc[i] = segments[i].modCount;
+ if (segments[i].containsValue(value))
+ return true;
+ }
+ boolean cleanSweep = true;
+ if (mcsum != 0) {
+ for (int i = 0; i < segments.length; ++i) {
+ int c = segments[i].count;
+ if (mc[i] != segments[i].modCount) {
+ cleanSweep = false;
+ break;
+ }
+ }
+ }
+ if (cleanSweep)
+ return false;
+ }
+ // Resort to locking all segments
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].lock();
+ boolean found = false;
+ try {
+ for (int i = 0; i < segments.length; ++i) {
+ if (segments[i].containsValue(value)) {
+ found = true;
+ break;
+ }
+ }
+ } finally {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].unlock();
+ }
+ return found;
+ }
+
+ /**
+ * Legacy method testing if some key maps into the specified value
+ * in this table. This method is identical in functionality to
+ * {@link #containsValue}, and exists solely to ensure
+ * full compatibility with class {@link java.util.Hashtable},
+ * which supported this method prior to introduction of the
+ * Java Collections framework.
+
+ * @param value a value to search for
+ * @return <tt>true</tt> if and only if some key maps to the
+ * <tt>value</tt> argument in this table as
+ * determined by the <tt>equals</tt> method;
+ * <tt>false</tt> otherwise
+ * @throws NullPointerException if the specified value is null
+ */
+ public boolean contains(Object value) {
+ return containsValue(value);
+ }
+
+ /**
+ * Maps the specified key to the specified value in this table.
+ * Neither the key nor the value can be null.
+ *
+ * <p> The value can be retrieved by calling the <tt>get</tt> method
+ * with a key that is equal to the original key.
+ *
+ * @param key key with which the specified value is to be associated
+ * @param value value to be associated with the specified key
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V put(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V putIfAbsent(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).put(key, hash, value, true);
+ }
+
+ /**
+ * Copies all of the mappings from the specified map to this one.
+ * These mappings replace any mappings that this map had for any of the
+ * keys currently in the specified map.
+ *
+ * @param m mappings to be stored in this map
+ */
+ public void putAll(Map<? extends K, ? extends V> m) {
+ for (Map.Entry<? extends K, ? extends V> e : m.entrySet())
+ put(e.getKey(), e.getValue());
+ }
+
+ /**
+ * Removes the key (and its corresponding value) from this map.
+ * This method does nothing if the key is not in the map.
+ *
+ * @param key the key that needs to be removed
+ * @return the previous value associated with <tt>key</tt>, or
+ * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @throws NullPointerException if the specified key is null
+ */
+ public V remove(Object key) {
+ int hash = hashOf(key);
+ return segmentFor(hash).remove(key, hash, null, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if the specified key is null
+ */
+ public boolean remove(Object key, Object value) {
+ int hash = hashOf(key);
+ if (value == null)
+ return false;
+ return segmentFor(hash).remove(key, hash, value, false) != null;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @throws NullPointerException if any of the arguments are null
+ */
+ public boolean replace(K key, V oldValue, V newValue) {
+ if (oldValue == null || newValue == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, oldValue, newValue);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the previous value associated with the specified key,
+ * or <tt>null</tt> if there was no mapping for the key
+ * @throws NullPointerException if the specified key or value is null
+ */
+ public V replace(K key, V value) {
+ if (value == null)
+ throw new NullPointerException();
+ int hash = hashOf(key);
+ return segmentFor(hash).replace(key, hash, value);
+ }
+
+ /**
+ * Removes all of the mappings from this map.
+ */
+ public void clear() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].clear();
+ }
+
+ /**
+ * Removes any stale entries whose keys have been finalized. Use of this
+ * method is normally not necessary since stale entries are automatically
+ * removed lazily, when blocking operations are required. However, there
+ * are some cases where this operation should be performed eagerly, such
+ * as cleaning up old references to a ClassLoader in a multi-classloader
+ * environment.
+ *
+ * Note: this method will acquire locks, one at a time, across all segments
+ * of this table, so if it is to be used, it should be used sparingly.
+ */
+ public void purgeStaleEntries() {
+ for (int i = 0; i < segments.length; ++i)
+ segments[i].removeStale();
+ }
+
+
+ /**
+ * Returns a {@link Set} view of the keys contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from this map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<K> keySet() {
+ Set<K> ks = keySet;
+ return (ks != null) ? ks : (keySet = new KeySet());
+ }
+
+ /**
+ * Returns a {@link Collection} view of the values contained in this map.
+ * The collection is backed by the map, so changes to the map are
+ * reflected in the collection, and vice-versa. The collection
+ * supports element removal, which removes the corresponding
+ * mapping from this map, via the <tt>Iterator.remove</tt>,
+ * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+ * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not
+ * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Collection<V> values() {
+ Collection<V> vs = values;
+ return (vs != null) ? vs : (values = new Values());
+ }
+
+ /**
+ * Returns a {@link Set} view of the mappings contained in this map.
+ * The set is backed by the map, so changes to the map are
+ * reflected in the set, and vice-versa. The set supports element
+ * removal, which removes the corresponding mapping from the map,
+ * via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+ * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
+ * operations. It does not support the <tt>add</tt> or
+ * <tt>addAll</tt> operations.
+ *
+ * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
+ * that will never throw {@link ConcurrentModificationException},
+ * and guarantees to traverse elements as they existed upon
+ * construction of the iterator, and may (but is not guaranteed to)
+ * reflect any modifications subsequent to construction.
+ */
+ public Set<Map.Entry<K,V>> entrySet() {
+ Set<Map.Entry<K,V>> es = entrySet;
+ return (es != null) ? es : (entrySet = new EntrySet());
+ }
+
+ /**
+ * Returns an enumeration of the keys in this table.
+ *
+ * @return an enumeration of the keys in this table
+ * @see #keySet()
+ */
+ public Enumeration<K> keys() {
+ return new KeyIterator();
+ }
+
+ /**
+ * Returns an enumeration of the values in this table.
+ *
+ * @return an enumeration of the values in this table
+ * @see #values()
+ */
+ public Enumeration<V> elements() {
+ return new ValueIterator();
+ }
+
+ /* ---------------- Iterator Support -------------- */
+
+ abstract class HashIterator {
+ int nextSegmentIndex;
+ int nextTableIndex;
+ HashEntry<K,V>[] currentTable;
+ HashEntry<K, V> nextEntry;
+ HashEntry<K, V> lastReturned;
+ K currentKey; // Strong reference to weak key (prevents gc)
+
+ HashIterator() {
+ nextSegmentIndex = segments.length - 1;
+ nextTableIndex = -1;
+ advance();
+ }
+
+ public boolean hasMoreElements() { return hasNext(); }
+
+ final void advance() {
+ if (nextEntry != null && (nextEntry = nextEntry.next) != null)
+ return;
+
+ while (nextTableIndex >= 0) {
+ if ( (nextEntry = currentTable[nextTableIndex--]) != null)
+ return;
+ }
+
+ while (nextSegmentIndex >= 0) {
+ Segment<K,V> seg = segments[nextSegmentIndex--];
+ if (seg.count != 0) {
+ currentTable = seg.table;
+ for (int j = currentTable.length - 1; j >= 0; --j) {
+ if ( (nextEntry = currentTable[j]) != null) {
+ nextTableIndex = j - 1;
+ return;
+ }
+ }
+ }
+ }
+ }
+
+ public boolean hasNext() {
+ while (nextEntry != null) {
+ if (nextEntry.key() != null)
+ return true;
+ advance();
+ }
+
+ return false;
+ }
+
+ HashEntry<K,V> nextEntry() {
+ do {
+ if (nextEntry == null)
+ throw new NoSuchElementException();
+
+ lastReturned = nextEntry;
+ currentKey = lastReturned.key();
+ advance();
+ } while (currentKey == null); // Skip GC'd keys
+
+ return lastReturned;
+ }
+
+ public void remove() {
+ if (lastReturned == null)
+ throw new IllegalStateException();
+ ConcurrentReferenceHashMap.this.remove(currentKey);
+ lastReturned = null;
+ }
+ }
+
+ final class KeyIterator
+ extends HashIterator
+ implements Iterator<K>, Enumeration<K>
+ {
+ public K next() { return super.nextEntry().key(); }
+ public K nextElement() { return super.nextEntry().key(); }
+ }
+
+ final class ValueIterator
+ extends HashIterator
+ implements Iterator<V>, Enumeration<V>
+ {
+ public V next() { return super.nextEntry().value(); }
+ public V nextElement() { return super.nextEntry().value(); }
+ }
+
+ /*
+ * This class is needed for JDK5 compatibility.
+ */
+ static class SimpleEntry<K, V> implements Entry<K, V>,
+ java.io.Serializable {
+ private static final long serialVersionUID = -8499721149061103585L;
+
+ private final K key;
+ private V value;
+
+ public SimpleEntry(K key, V value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public SimpleEntry(Entry<? extends K, ? extends V> entry) {
+ this.key = entry.getKey();
+ this.value = entry.getValue();
+ }
+
+ public K getKey() {
+ return key;
+ }
+
+ public V getValue() {
+ return value;
+ }
+
+ public V setValue(V value) {
+ V oldValue = this.value;
+ this.value = value;
+ return oldValue;
+ }
+
+ public boolean equals(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ @SuppressWarnings("unchecked")
+ Map.Entry e = (Map.Entry) o;
+ return eq(key, e.getKey()) && eq(value, e.getValue());
+ }
+
+ public int hashCode() {
+ return (key == null ? 0 : key.hashCode())
+ ^ (value == null ? 0 : value.hashCode());
+ }
+
+ public String toString() {
+ return key + "=" + value;
+ }
+
+ private static boolean eq(Object o1, Object o2) {
+ return o1 == null ? o2 == null : o1.equals(o2);
+ }
+ }
+
+
+ /**
+ * Custom Entry class used by EntryIterator.next(), that relays setValue
+ * changes to the underlying map.
+ */
+ final class WriteThroughEntry extends SimpleEntry<K,V>
+ {
+ private static final long serialVersionUID = -7900634345345313646L;
+
+ WriteThroughEntry(K k, V v) {
+ super(k,v);
+ }
+
+ /**
+ * Set our entry's value and write through to the map. The
+ * value to return is somewhat arbitrary here. Since a
+ * WriteThroughEntry does not necessarily track asynchronous
+ * changes, the most recent "previous" value could be
+ * different from what we return (or could even have been
+ * removed in which case the put will re-establish). We do not
+ * and cannot guarantee more.
+ */
+ public V setValue(V value) {
+ if (value == null) throw new NullPointerException();
+ V v = super.setValue(value);
+ ConcurrentReferenceHashMap.this.put(getKey(), value);
+ return v;
+ }
+ }
+
+ final class EntryIterator
+ extends HashIterator
+ implements Iterator<Entry<K,V>>
+ {
+ public Map.Entry<K,V> next() {
+ HashEntry<K,V> e = super.nextEntry();
+ return new WriteThroughEntry(e.key(), e.value());
+ }
+ }
+
+ final class KeySet extends AbstractSet<K> {
+ public Iterator<K> iterator() {
+ return new KeyIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsKey(o);
+ }
+ public boolean remove(Object o) {
+ return ConcurrentReferenceHashMap.this.remove(o) != null;
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class Values extends AbstractCollection<V> {
+ public Iterator<V> iterator() {
+ return new ValueIterator();
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public boolean contains(Object o) {
+ return ConcurrentReferenceHashMap.this.containsValue(o);
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ final class EntrySet extends AbstractSet<Map.Entry<K,V>> {
+ public Iterator<Map.Entry<K,V>> iterator() {
+ return new EntryIterator();
+ }
+ public boolean contains(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ V v = ConcurrentReferenceHashMap.this.get(e.getKey());
+ return v != null && v.equals(e.getValue());
+ }
+ public boolean remove(Object o) {
+ if (!(o instanceof Map.Entry))
+ return false;
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ return ConcurrentReferenceHashMap.this.remove(e.getKey(), e.getValue());
+ }
+ public int size() {
+ return ConcurrentReferenceHashMap.this.size();
+ }
+ public boolean isEmpty() {
+ return ConcurrentReferenceHashMap.this.isEmpty();
+ }
+ public void clear() {
+ ConcurrentReferenceHashMap.this.clear();
+ }
+ }
+
+ /* ---------------- Serialization Support -------------- */
+
+ /**
+ * Save the state of the <tt>ConcurrentReferenceHashMap</tt> instance to a
+ * stream (i.e., serialize it).
+ * @param s the stream
+ * @serialData
+ * the key (Object) and value (Object)
+ * for each key-value mapping, followed by a null pair.
+ * The key-value mappings are emitted in no particular order.
+ */
+ private void writeObject(java.io.ObjectOutputStream s) throws IOException {
+ s.defaultWriteObject();
+
+ for (int k = 0; k < segments.length; ++k) {
+ Segment<K,V> seg = segments[k];
+ seg.lock();
+ try {
+ HashEntry<K,V>[] tab = seg.table;
+ for (int i = 0; i < tab.length; ++i) {
+ for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+ K key = e.key();
+ if (key == null) // Skip GC'd keys
+ continue;
+
+ s.writeObject(key);
+ s.writeObject(e.value());
+ }
+ }
+ } finally {
+ seg.unlock();
+ }
+ }
+ s.writeObject(null);
+ s.writeObject(null);
+ }
+
+ /**
+ * Reconstitute the <tt>ConcurrentReferenceHashMap</tt> instance from a
+ * stream (i.e., deserialize it).
+ * @param s the stream
+ */
+ @SuppressWarnings("unchecked")
+ private void readObject(java.io.ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+ s.defaultReadObject();
+
+ // Initialize each segment to be minimally sized, and let grow.
+ for (int i = 0; i < segments.length; ++i) {
+ segments[i].setTable(new HashEntry[1]);
+ }
+
+ // Read the keys and values, and put the mappings in the table
+ for (;;) {
+ K key = (K) s.readObject();
+ V value = (V) s.readObject();
+ if (key == null)
+ break;
+ put(key, value);
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/EndpointImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,463 @@
+package org.jboss.remoting;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.EndpointPermission;
+import org.jboss.remoting.LocalServiceConfiguration;
+import org.jboss.remoting.RemoteServiceConfiguration;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.ServiceListener;
+import org.jboss.remoting.ServiceURI;
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting.Version;
+import org.jboss.remoting.spi.AbstractHandleableCloseable;
+import org.jboss.remoting.spi.AbstractSimpleCloseable;
+import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.remoting.spi.RequestHandlerSource;
+import org.jboss.xnio.FailedIoFuture;
+import org.jboss.xnio.FinishedIoFuture;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.WeakCloseable;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class EndpointImpl extends AbstractHandleableCloseable<Endpoint> implements Endpoint {
+
+ static {
+ // Print Remoting "greeting" message
+ Logger.getLogger("org.jboss.remoting").info("JBoss Remoting version %s", Version.VERSION);
+ }
+
+ static <K, V> Map<K, V> hashMap() {
+ return new HashMap<K, V>();
+ }
+
+ static <T> Set<T> hashSet() {
+ return new HashSet<T>();
+ }
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.endpoint");
+
+ private final String name;
+
+ private final ConcurrentMap<Object, Object> endpointMap = new ConcurrentHashMap<Object, Object>();
+
+ private final Object serviceLock = new Object();
+ private final Map<Object, ServiceListenerRegistration> serviceListenerMap = hashMap();
+ private final Set<ServiceRegistration> serviceRegistrations = hashSet();
+
+ private static final EndpointPermission CREATE_ENDPOINT_PERM = new EndpointPermission("createEndpoint");
+ private static final EndpointPermission CREATE_REQUEST_HANDLER_PERM = new EndpointPermission("createRequestHandler");
+ private static final EndpointPermission REGISTER_SERVICE_PERM = new EndpointPermission("registerService");
+ private static final EndpointPermission CREATE_CLIENT_PERM = new EndpointPermission("createClient");
+ private static final EndpointPermission CREATE_CLIENT_SOURCE_PERM = new EndpointPermission("createClientSource");
+ private static final EndpointPermission REGISTER_REMOTE_SERVICE_PERM = new EndpointPermission("registerRemoteService");
+ private static final EndpointPermission ADD_SERVICE_LISTENER_PERM = new EndpointPermission("addServiceListener");
+
+ public EndpointImpl(final Executor executor, final String name) {
+ super(executor);
+ final SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_ENDPOINT_PERM);
+ }
+ this.executor = executor;
+ this.name = name;
+ }
+
+ private final Executor executor;
+
+ protected Executor getOrderedExecutor() {
+ return new OrderedExecutor(executor);
+ }
+
+ protected Executor getExecutor() {
+ return executor;
+ }
+
+ // Endpoint implementation
+
+ public String getName() {
+ return name;
+ }
+
+ public ConcurrentMap<Object, Object> getAttributes() {
+ return endpointMap;
+ }
+
+ public <I, O> Handle<RequestHandler> createRequestHandler(final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_REQUEST_HANDLER_PERM);
+ }
+ LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
+ config.setExecutor(executor);
+ config.setRequestListener(requestListener);
+ config.setClientContext(new ClientContextImpl(executor));
+ final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
+ final WeakCloseable lrhCloseable = new WeakCloseable(localRequestHandler);
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ localRequestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ key.remove();
+ }
+ });
+ localRequestHandler.open();
+ return localRequestHandler.getHandle();
+ }
+
+ public <I, O> Handle<RequestHandlerSource> registerService(final LocalServiceConfiguration<I, O> configuration) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(REGISTER_SERVICE_PERM);
+ }
+ final String serviceType = configuration.getServiceType();
+ final String groupName = configuration.getGroupName();
+ final int metric = configuration.getMetric();
+ if (serviceType == null) {
+ throw new NullPointerException("serviceType is null");
+ }
+ if (groupName == null) {
+ throw new NullPointerException("groupName is null");
+ }
+ if (serviceType.length() == 0) {
+ throw new IllegalArgumentException("serviceType is empty");
+ }
+ if (groupName.length() == 0) {
+ throw new IllegalArgumentException("groupName is empty");
+ }
+ if (metric < 0) {
+ throw new IllegalArgumentException("metric must be greater than or equal to zero");
+ }
+ final LocalRequestHandlerSource.Config<I, O> config = new LocalRequestHandlerSource.Config<I,O>(configuration.getRequestClass(), configuration.getReplyClass());
+ config.setRequestListener(configuration.getRequestListener());
+ config.setExecutor(executor);
+ final LocalRequestHandlerSource<I, O> localRequestHandlerSource = new LocalRequestHandlerSource<I, O>(config);
+ final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, name, localRequestHandlerSource);
+ final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceRegistrations.remove(registration);
+ }
+ }
+ };
+ registration.setHandle(newHandle);
+ synchronized (serviceLock) {
+ serviceRegistrations.add(registration);
+ for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
+ final ServiceListener listener = slr.getServiceListener();
+ try {
+ final ServiceListener.ServiceInfo serviceInfo = new ServiceListener.ServiceInfo();
+ serviceInfo.setEndpointName(name);
+ serviceInfo.setGroupName(groupName);
+ serviceInfo.setServiceType(serviceType);
+ serviceInfo.setMetric(metric);
+ serviceInfo.setRegistrationHandle(newHandle);
+ serviceInfo.setRemote(false);
+ serviceInfo.setRequestHandlerSource(localRequestHandlerSource);
+ listener.serviceRegistered(slr.handle, serviceInfo);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(localRequestHandlerSource));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ localRequestHandlerSource.addCloseHandler(new CloseHandler<RequestHandlerSource>() {
+ public void handleClose(final RequestHandlerSource closed) {
+ key.remove();
+ }
+ });
+ localRequestHandlerSource.open();
+ return localRequestHandlerSource.getHandle();
+ }
+
+ private static void logListenerError(final Throwable t) {
+ log.error(t, "Service listener threw an exception");
+ }
+
+ public <I, O> Client<I, O> createClient(final RequestHandler requestHandler, final Class<I> requestType, final Class<O> replyType) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_CLIENT_PERM);
+ }
+ boolean ok = false;
+ final Handle<RequestHandler> handle = requestHandler.getHandle();
+ try {
+ final ClientImpl<I, O> client = ClientImpl.create(handle, executor, requestType, replyType);
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(client));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ client.addCloseHandler(new CloseHandler<Client>() {
+ public void handleClose(final Client closed) {
+ key.remove();
+ }
+ });
+ ok = true;
+ return client;
+ } finally {
+ if (! ok) {
+ IoUtils.safeClose(handle);
+ }
+ }
+ }
+
+ public <I, O> ClientSource<I, O> createClientSource(final RequestHandlerSource requestHandlerSource, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(CREATE_CLIENT_SOURCE_PERM);
+ }
+ boolean ok = false;
+ final Handle<RequestHandlerSource> handle = requestHandlerSource.getHandle();
+ try {
+ final ClientSourceImpl<I, O> clientSource = ClientSourceImpl.create(handle, this, requestClass, replyClass);
+ final WeakCloseable lrhCloseable = new WeakCloseable(new WeakReference<Closeable>(clientSource));
+ final Key key = addCloseHandler(new CloseHandler<Endpoint>() {
+ public void handleClose(final Endpoint closed) {
+ IoUtils.safeClose(lrhCloseable);
+ }
+ });
+ clientSource.addCloseHandler(new CloseHandler<ClientSource>() {
+ public void handleClose(final ClientSource closed) {
+ key.remove();
+ }
+ });
+ ok = true;
+ return clientSource;
+ } finally {
+ if (! ok) {
+ IoUtils.safeClose(handle);
+ }
+ }
+ }
+
+ public <I, O> IoFuture<ClientSource<I, O>> locateService(final URI serviceUri, final Class<I> requestClass, final Class<O> replyClass) throws IllegalArgumentException {
+ if (serviceUri == null) {
+ throw new NullPointerException("serviceUri is null");
+ }
+ if (! ServiceURI.isRemotingServiceUri(serviceUri)) {
+ throw new IllegalArgumentException("Not a valid remoting service URI");
+ }
+ final String endpointName = ServiceURI.getEndpointName(serviceUri);
+ final String groupName = ServiceURI.getGroupName(serviceUri);
+ final String serviceType = ServiceURI.getServiceType(serviceUri);
+ synchronized (serviceLock) {
+ int bestMetric = Integer.MAX_VALUE;
+ List<ServiceRegistration> candidates = new ArrayList<ServiceRegistration>();
+ for (ServiceRegistration svc : serviceRegistrations) {
+ if (svc.matches(serviceType, groupName, endpointName)) {
+ final int metric = svc.getMetric();
+ if (metric < bestMetric) {
+ candidates.clear();
+ candidates.add(svc);
+ } else if (metric == bestMetric) {
+ candidates.add(svc);
+ }
+ }
+ }
+ final int size = candidates.size();
+ if (size == 0) {
+ final FutureClientSource<I, O> futureClientSource = new FutureClientSource<I, O>();
+ final SimpleCloseable listenerHandle = addServiceListener(new ServiceListener() {
+ public void serviceRegistered(final SimpleCloseable listenerHandle, final ServiceInfo info) {
+ final String addedEndpointName = info.getEndpointName();
+ final String addedServiceType = info.getServiceType();
+ final String addedGroupName = info.getGroupName();
+ final RequestHandlerSource requestHandlerSource = info.getRequestHandlerSource();
+ if (endpointName != null && endpointName.length() > 0 && !endpointName.equals(addedEndpointName)) {
+ // no match
+ return;
+ }
+ if (serviceType != null && serviceType.length() > 0 && !serviceType.equals(addedServiceType)) {
+ // no match
+ return;
+ }
+ if (groupName != null && groupName.length() > 0 && !groupName.equals(addedGroupName)) {
+ // no match
+ return;
+ }
+ try {
+ // match!
+ final ClientSource<I, O> clientSource = createClientSource(requestHandlerSource, requestClass, replyClass);
+ futureClientSource.setResult(clientSource);
+ } catch (IOException e) {
+ futureClientSource.setException(e);
+ } finally {
+ IoUtils.safeClose(listenerHandle);
+ }
+ }
+ }, true);
+ futureClientSource.setListenerHandle(listenerHandle);
+ return futureClientSource;
+ }
+ final RequestHandlerSource handlerSource;
+ if (size == 1) {
+ handlerSource = candidates.get(0).getHandlerSource();
+ } else {
+ int idx = (int) ((double) candidates.size() * Math.random());
+ handlerSource = candidates.get(idx).getHandlerSource();
+ }
+ try {
+ return new FinishedIoFuture<ClientSource<I,O>>(createClientSource(handlerSource, requestClass, replyClass));
+ } catch (IOException e) {
+ return new FailedIoFuture<ClientSource<I,O>>(e);
+ }
+ }
+ }
+
+ public SimpleCloseable registerRemoteService(final RemoteServiceConfiguration configuration) throws IllegalArgumentException, IOException {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(REGISTER_REMOTE_SERVICE_PERM);
+ }
+ final RequestHandlerSource handlerSource = configuration.getRequestHandlerSource();
+ final String serviceType = configuration.getServiceType();
+ final String groupName = configuration.getGroupName();
+ final String endpointName = configuration.getEndpointName();
+ final int metric = configuration.getMetric();
+ if (handlerSource == null) {
+ throw new NullPointerException("handlerSource is null");
+ }
+ if (serviceType == null) {
+ throw new NullPointerException("serviceType is null");
+ }
+ if (groupName == null) {
+ throw new NullPointerException("groupName is null");
+ }
+ if (endpointName == null) {
+ throw new NullPointerException("endpointName is null");
+ }
+ if (serviceType.length() == 0) {
+ throw new IllegalArgumentException("serviceType is empty");
+ }
+ if (groupName.length() == 0) {
+ throw new IllegalArgumentException("groupName is empty");
+ }
+ if (endpointName.length() == 0) {
+ throw new IllegalArgumentException("endpointName is empty");
+ }
+ if (endpointName.equals(name)) {
+ throw new IllegalArgumentException("remote endpoint has the same name as the local endpoint");
+ }
+ if (metric < 1) {
+ throw new IllegalArgumentException("metric must be greater than zero");
+ }
+ final ServiceRegistration registration = new ServiceRegistration(serviceType, groupName, endpointName, metric, handlerSource);
+ final AbstractSimpleCloseable newHandle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceRegistrations.remove(registration);
+ }
+ }
+ };
+ registration.setHandle(newHandle);
+ synchronized (serviceLock) {
+ serviceRegistrations.add(registration);
+ for (final ServiceListenerRegistration slr : serviceListenerMap.values()) {
+ final ServiceListener listener = slr.getServiceListener();
+ try {
+ final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
+ info.setEndpointName(endpointName);
+ info.setGroupName(groupName);
+ info.setMetric(metric);
+ info.setRegistrationHandle(newHandle);
+ info.setRemote(true);
+ info.setRequestHandlerSource(handlerSource);
+ info.setServiceType(serviceType);
+ listener.serviceRegistered(slr.handle, info);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ return newHandle;
+ }
+
+ public SimpleCloseable addServiceListener(final ServiceListener serviceListener, final boolean onlyNew) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(ADD_SERVICE_LISTENER_PERM);
+ }
+ final Object key = new Object();
+ synchronized (serviceLock) {
+ final ServiceListenerRegistration registration = new ServiceListenerRegistration(serviceListener);
+ serviceListenerMap.put(key, registration);
+ final AbstractSimpleCloseable handle = new AbstractSimpleCloseable(executor) {
+ protected void closeAction() throws IOException {
+ synchronized (serviceLock) {
+ serviceListenerMap.remove(key);
+ }
+ }
+ };
+ registration.setHandle(handle);
+ if (! onlyNew) {
+ for (final ServiceRegistration reg : serviceRegistrations) {
+ try {
+ final ServiceListener.ServiceInfo info = new ServiceListener.ServiceInfo();
+ info.setEndpointName(reg.getEndpointName());
+ info.setGroupName(reg.getGroupName());
+ info.setMetric(reg.getMetric());
+ info.setRegistrationHandle(reg.getHandle());
+ info.setRemote(reg.isRemote());
+ info.setRequestHandlerSource(reg.getHandlerSource());
+ info.setServiceType(reg.getServiceType());
+ serviceListener.serviceRegistered(handle, info);
+ } catch (Throwable t) {
+ logListenerError(t);
+ }
+ }
+ }
+ return handle;
+ }
+ }
+
+ private static final class ServiceListenerRegistration {
+ private final ServiceListener serviceListener;
+ private volatile SimpleCloseable handle;
+
+ private ServiceListenerRegistration(final ServiceListener serviceListener) {
+ this.serviceListener = serviceListener;
+ }
+
+ ServiceListener getServiceListener() {
+ return serviceListener;
+ }
+
+ void setHandle(final SimpleCloseable handle) {
+ this.handle = handle;
+ }
+ }
+
+ public String toString() {
+ return "endpoint \"" + name + "\" <" + Integer.toString(hashCode()) + ">";
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureClientSource.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.xnio.AbstractIoFuture;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.IoUtils;
+
+/**
+ *
+ */
+final class FutureClientSource<I, O> extends AbstractIoFuture<ClientSource<I, O>> {
+
+ private volatile SimpleCloseable listenerHandle;
+
+ protected boolean setException(final IOException exception) {
+ return super.setException(exception);
+ }
+
+ protected boolean setResult(final ClientSource<I, O> result) {
+ return super.setResult(result);
+ }
+
+ public IoFuture<ClientSource<I, O>> cancel() {
+ IoUtils.safeClose(listenerHandle);
+ return this;
+ }
+
+ void setListenerHandle(final SimpleCloseable listenerHandle) {
+ this.listenerHandle = listenerHandle;
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/FutureReplyImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import org.jboss.remoting.ReplyException;
+import org.jboss.remoting.spi.RemoteRequestContext;
+import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.xnio.AbstractIoFuture;
+import org.jboss.xnio.IoFuture;
+
+/**
+ *
+ */
+final class FutureReplyImpl<O> extends AbstractIoFuture<O> {
+
+ private final Executor executor;
+ private final Class<O> replyType;
+ private final ReplyHandler replyHandler = new Handler();
+ private volatile RemoteRequestContext remoteRequestContext;
+
+ FutureReplyImpl(final Executor executor, final Class<O> replyType) {
+ this.executor = executor;
+ this.replyType = replyType;
+ }
+
+ void setRemoteRequestContext(final RemoteRequestContext remoteRequestContext) {
+ this.remoteRequestContext = remoteRequestContext;
+ }
+
+ public IoFuture<O> cancel() {
+ // must not be called before setRemoteRequestContext
+ remoteRequestContext.cancel();
+ return this;
+ }
+
+ protected Executor getNotifierExecutor() {
+ return executor;
+ }
+
+ ReplyHandler getReplyHandler() {
+ return replyHandler;
+ }
+
+ private final class Handler implements ReplyHandler {
+
+ public void handleReply(final Object reply) {
+ final O actualReply;
+ try {
+ actualReply = replyType.cast(reply);
+ } catch (ClassCastException e) {
+ setException(new ReplyException("Reply was of the wrong type (got <" + reply.getClass().getName() + ">; expected <? extends " + replyType.getName() + ">"));
+ return;
+ }
+ setResult(actualReply);
+ }
+
+ public void handleException(final IOException exception) {
+ setException(exception);
+ }
+
+ public void handleCancellation() {
+ finishCancel();
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandler.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.RemoteRequestException;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting.spi.RemoteRequestContext;
+import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.remoting.spi.SpiUtils;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class LocalRequestHandler<I, O> extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
+
+ private final RequestListener<I, O> requestListener;
+ private final ClientContextImpl clientContext;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.listener");
+
+ LocalRequestHandler(Config<I, O> config) {
+ super(config.getExecutor());
+ requestListener = config.getRequestListener();
+ clientContext = config.getClientContext();
+ requestClass = config.getRequestClass();
+ replyClass = config.getReplyClass();
+ }
+
+ public RemoteRequestContext receiveRequest(final Object request, final ReplyHandler replyHandler) {
+ final RequestContextImpl<O> context = new RequestContextImpl<O>(replyHandler, clientContext, replyClass);
+ try {
+ final I castRequest;
+ try {
+ castRequest = requestClass.cast(request);
+ } catch (ClassCastException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Request is the wrong type; expected " + requestClass + " but got " + request.getClass()));
+ return SpiUtils.getBlankRemoteRequestContext();
+ }
+ context.execute(new Runnable() {
+ public void run() {
+ try {
+ requestListener.handleRequest(context, castRequest);
+ } catch (RemoteExecutionException e) {
+ SpiUtils.safeHandleException(replyHandler, e);
+ } catch (Throwable t) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteExecutionException("Request handler threw an exception", t));
+ }
+ }
+ });
+ } catch (RejectedExecutionException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteRequestException("Execution was rejected (server may be too busy)", e));
+ return SpiUtils.getBlankRemoteRequestContext();
+ }
+ return new RemoteRequestContext() {
+ public void cancel() {
+ context.cancel();
+ }
+ };
+ }
+
+ protected void closeAction() throws IOException {
+ try {
+ requestListener.handleClientClose(clientContext);
+ } catch (Throwable t) {
+ log.error(t, "Unexpected exception in request listener client close handler method");
+ }
+ }
+
+ void open() throws IOException {
+ try {
+ requestListener.handleClientOpen(clientContext);
+ } catch (Throwable t) {
+ final IOException ioe = new IOException("Failed to open client context");
+ ioe.initCause(t);
+ throw ioe;
+ }
+ }
+
+ public String toString() {
+ return "local request handler <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ }
+
+ static class Config<I, O> {
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private Executor executor;
+ private RequestListener<I, O> requestListener;
+ private ClientContextImpl clientContext;
+
+ Config(final Class<I> requestClass, final Class<O> replyClass) {
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ public Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ public Class<O> getReplyClass() {
+ return replyClass;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ public RequestListener<I, O> getRequestListener() {
+ return requestListener;
+ }
+
+ public void setRequestListener(final RequestListener<I, O> requestListener) {
+ this.requestListener = requestListener;
+ }
+
+ public ClientContextImpl getClientContext() {
+ return clientContext;
+ }
+
+ public void setClientContext(final ClientContextImpl clientContext) {
+ this.clientContext = clientContext;
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/LocalRequestHandlerSource.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting.spi.Handle;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.remoting.spi.RequestHandlerSource;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class LocalRequestHandlerSource<I, O> extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
+
+ private final RequestListener<I, O> requestListener;
+ private final ServiceContextImpl serviceContext;
+ private final Executor executor;
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.listener-source");
+
+ LocalRequestHandlerSource(final Config<I, O> config) {
+ super(config.getExecutor());
+ requestClass = config.getRequestClass();
+ replyClass = config.getReplyClass();
+ requestListener = config.getRequestListener();
+ executor = config.getExecutor();
+ serviceContext = new ServiceContextImpl(executor);
+ }
+
+ public Handle<RequestHandler> createRequestHandler() throws IOException {
+ if (isOpen()) {
+ final LocalRequestHandler.Config<I, O> config = new LocalRequestHandler.Config<I, O>(requestClass, replyClass);
+ config.setExecutor(executor);
+ config.setRequestListener(requestListener);
+ config.setClientContext(new ClientContextImpl(serviceContext));
+ final LocalRequestHandler<I, O> localRequestHandler = new LocalRequestHandler<I, O>(config);
+ localRequestHandler.open();
+ return localRequestHandler.getHandle();
+ } else {
+ throw new IOException("LocalRequestHandlerSource is closed");
+ }
+ }
+
+ void open() throws IOException {
+ try {
+ requestListener.handleServiceOpen(serviceContext);
+ addCloseHandler(new CloseHandler<RequestHandlerSource>() {
+ public void handleClose(final RequestHandlerSource closed) {
+ try {
+ requestListener.handleServiceClose(serviceContext);
+ } catch (Throwable t) {
+ log.error(t, "Unexpected exception in request listener client close handler method");
+ }
+ }
+ });
+ } catch (Throwable t) {
+ final IOException ioe = new IOException("Failed to open client context");
+ ioe.initCause(t);
+ throw ioe;
+ }
+ }
+
+ ServiceContextImpl getServiceContext() {
+ return serviceContext;
+ }
+
+ public String toString() {
+ return "local request handler source <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ }
+
+ static class Config<I, O> {
+ private final Class<I> requestClass;
+ private final Class<O> replyClass;
+ private Executor executor;
+ private RequestListener<I, O> requestListener;
+
+ Config(final Class<I> requestClass, final Class<O> replyClass) {
+ this.requestClass = requestClass;
+ this.replyClass = replyClass;
+ }
+
+ public Class<I> getRequestClass() {
+ return requestClass;
+ }
+
+ public Class<O> getReplyClass() {
+ return replyClass;
+ }
+
+ public Executor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(final Executor executor) {
+ this.executor = executor;
+ }
+
+ public RequestListener<I, O> getRequestListener() {
+ return requestListener;
+ }
+
+ public void setRequestListener(final RequestListener<I, O> requestListener) {
+ this.requestListener = requestListener;
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/OrderedExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/OrderedExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.util.LinkedList;
+import java.util.concurrent.Executor;
+import org.jboss.xnio.log.Logger;
+
+/**
+ * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
+ * <p/>
+ * More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
+ * same method, will result in B's task running after A's.
+ */
+final class OrderedExecutor implements Executor {
+ private static final Logger log = Logger.getLogger(OrderedExecutor.class);
+
+ // @protectedby tasks
+ private final LinkedList<Runnable> tasks = new LinkedList<Runnable>();
+ // @protectedby tasks
+ private boolean running;
+ private final Executor parent;
+ private final Runnable runner;
+
+ /**
+ * Construct a new instance.
+ *
+ * @param parent the parent executor
+ */
+ OrderedExecutor(final Executor parent) {
+ this.parent = parent;
+ runner = new Runnable() {
+ public void run() {
+ for (;;) {
+ final Runnable task;
+ synchronized(tasks) {
+ task = tasks.poll();
+ if (task == null) {
+ running = false;
+ return;
+ }
+ }
+ try {
+ task.run();
+ } catch (Throwable t) {
+ log.error(t, "Runnable task %s failed", task);
+ }
+ }
+ }
+ };
+ }
+
+ /**
+ * Run a task.
+ *
+ * @param command the task to run.
+ */
+ public void execute(Runnable command) {
+ synchronized(tasks) {
+ tasks.add(command);
+ if (! running) {
+ running = true;
+ boolean ok = false;
+ try {
+ parent.execute(runner);
+ ok = true;
+ } finally {
+ if (! ok) {
+ running = false;
+ }
+ }
+ }
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/QueueExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/QueueExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,101 @@
+package org.jboss.remoting;
+
+import java.util.LinkedList;
+import java.util.Queue;
+import org.jboss.xnio.CloseableExecutor;
+import org.jboss.xnio.log.Logger;
+
+/**
+ * An executor designed to run all submitted tasks in the current thread. The queue is run continuously
+ * until the {@code close()} method is invoked. Jobs may be submitted to the queue from any thread.
+ * Only one thread should invoke the {@code runQueue()} method, which will run until the executor is
+ * shut down.
+ */
+final class QueueExecutor implements CloseableExecutor {
+ private static final Logger log = org.jboss.xnio.log.Logger.getLogger(QueueExecutor.class);
+
+ private final Queue<Runnable> queue = new LinkedList<Runnable>();
+
+ private State state = State.WAITING;
+
+ private enum State {
+ RUNNING,
+ WAITING,
+ STOPPING,
+ DOWN,
+ }
+
+ public void execute(Runnable command) {
+ synchronized(queue) {
+ switch (state) {
+ case WAITING:
+ state = State.RUNNING;
+ queue.notify();
+ // fall thru
+ case STOPPING:
+ case RUNNING:
+ queue.add(command);
+ break;
+ default:
+ throw new IllegalStateException("Executor is no longer available");
+ }
+ }
+ }
+
+ public void runQueue() {
+ boolean intr = Thread.interrupted();
+ try {
+ for (;;) {
+ final State newState;
+ synchronized(queue) {
+ while (state == State.WAITING) {
+ try {
+ queue.wait();
+ } catch (InterruptedException e) {
+ intr = true;
+ }
+ }
+ if (state == State.DOWN) {
+ throw new IllegalStateException("DOWN");
+ }
+ newState = state;
+ }
+ for (;;) {
+ final Runnable runnable;
+ synchronized(queue) {
+ runnable = queue.poll();
+ if (runnable == null) {
+ break;
+ }
+ }
+ try {
+ runnable.run();
+ } catch (Throwable t) {
+ log.trace(t, "Error occurred while processing run queue");
+ }
+ }
+ if (newState == State.STOPPING) {
+ synchronized(queue) {
+ state = State.DOWN;
+ return;
+ }
+ }
+ }
+ } finally {
+ if (intr) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ public void close() {
+ synchronized(queue) {
+ switch (state) {
+ case WAITING:
+ queue.notify();
+ case RUNNING:
+ state = State.STOPPING;
+ }
+ }
+ }
+}
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java 2009-02-26 17:58:02 UTC (rev 4854)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Remoting.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -87,11 +87,7 @@
* @return the endpoint
*/
public static Endpoint createEndpoint(final Executor executor, final String name) throws IOException {
- try {
- return (Endpoint) Class.forName("org.jboss.remoting.core.EndpointImpl").getConstructor(Executor.class, String.class).newInstance(executor, name);
- } catch (Exception e) {
- throw new EndpointException("Unable to create endpoint", e);
- }
+ return new EndpointImpl(executor, name);
}
/**
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.jboss.remoting.ClientContext;
+import org.jboss.remoting.IndeterminateOutcomeException;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.RemoteReplyException;
+import org.jboss.remoting.RequestCancelHandler;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.spi.ReplyHandler;
+import org.jboss.remoting.spi.SpiUtils;
+
+/**
+ *
+ */
+final class RequestContextImpl<O> implements RequestContext<O> {
+
+ private final AtomicBoolean closed = new AtomicBoolean();
+ private final Object cancelLock = new Object();
+ private final ReplyHandler replyHandler;
+ private final ClientContextImpl clientContext;
+ private final AtomicInteger taskCount = new AtomicInteger();
+
+ // @protectedby cancelLock
+ private boolean cancelled;
+ // @protectedby cancelLock
+ private Set<RequestCancelHandler<O>> cancelHandlers;
+ private final RequestListenerExecutor interruptingExecutor;
+ private final Class<O> replyClass;
+
+ RequestContextImpl(final ReplyHandler replyHandler, final ClientContextImpl clientContext, final Class<O> replyClass) {
+ this.replyHandler = replyHandler;
+ this.clientContext = clientContext;
+ this.replyClass = replyClass;
+ final Executor executor = clientContext.getExecutor();
+ //noinspection ThisEscapedInObjectConstruction
+ interruptingExecutor = new RequestListenerExecutor(executor, this);
+ }
+
+ public ClientContext getContext() {
+ return clientContext;
+ }
+
+ public boolean isCancelled() {
+ synchronized (cancelLock) {
+ return cancelled;
+ }
+ }
+
+ public void sendReply(final O reply) throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ final O actualReply;
+ try {
+ actualReply = replyClass.cast(reply);
+ } catch (ClassCastException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply was the wrong type", e));
+ throw e;
+ }
+ try {
+ replyHandler.handleReply(actualReply);
+ } catch (IOException e) {
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply failed", e));
+ throw e;
+ }
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void sendFailure(final String msg, final Throwable cause) throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ replyHandler.handleException(new RemoteExecutionException(msg, cause));
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void sendCancelled() throws IOException, IllegalStateException {
+ if (! closed.getAndSet(true)) {
+ try {
+ replyHandler.handleCancellation();
+ } catch (IOException e) {
+ // this is highly unlikely to succeed
+ SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote cancellation acknowledgement failed", e));
+ }
+ } else {
+ throw new IllegalStateException("Reply already sent");
+ }
+ }
+
+ public void addCancelHandler(final RequestCancelHandler<O> handler) {
+ synchronized (cancelLock) {
+ if (cancelled) {
+ SpiUtils.safeNotifyCancellation(handler, this);
+ } else {
+ if (cancelHandlers == null) {
+ cancelHandlers = new HashSet<RequestCancelHandler<O>>();
+ }
+ cancelHandlers.add(handler);
+ }
+ }
+ }
+
+ public void execute(final Runnable command) {
+ interruptingExecutor.execute(command);
+ }
+
+ protected void cancel() {
+ synchronized (cancelLock) {
+ if (! cancelled) {
+ cancelled = true;
+ if (cancelHandlers != null) {
+ for (final RequestCancelHandler<O> handler : cancelHandlers) {
+ interruptingExecutor.execute(new Runnable() {
+ public void run() {
+ SpiUtils.safeNotifyCancellation(handler, RequestContextImpl.this);
+ }
+ });
+ }
+ cancelHandlers = null;
+ }
+ interruptingExecutor.interruptAll();
+ }
+ }
+ }
+
+ void startTask() {
+ taskCount.incrementAndGet();
+ }
+
+ void finishTask() {
+ if (taskCount.decrementAndGet() == 0 && ! closed.getAndSet(true)) {
+ // no response sent! send back IndeterminateOutcomeException
+ SpiUtils.safeHandleException(replyHandler, new IndeterminateOutcomeException("No reply was sent by the request listener"));
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestListenerExecutor.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListenerExecutor.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Executor;
+
+/**
+ *
+ */
+final class RequestListenerExecutor implements Executor {
+
+ private final Set<Task> tasks = Collections.synchronizedSet(new HashSet<Task>());
+ private final Executor executor;
+ private final RequestContextImpl<?> requestContext;
+
+ public RequestListenerExecutor(final Executor executor, final RequestContextImpl<?> context) {
+ this.executor = executor;
+ requestContext = context;
+ }
+
+ private final class Task implements Runnable {
+ private volatile Thread thread;
+ private final Runnable runnable;
+
+ private Task(final Runnable runnable) {
+ this.runnable = runnable;
+ }
+
+ public void run() {
+ requestContext.startTask();
+ thread = Thread.currentThread();
+ tasks.add(this);
+ try {
+ runnable.run();
+ } finally {
+ requestContext.finishTask();
+ tasks.remove(this);
+ thread = null;
+ }
+ }
+ }
+
+ public void execute(final Runnable command) {
+ executor.execute(new Task(command));
+ }
+
+ public void interruptAll() {
+ synchronized (tasks) {
+ final Thread currentThread = Thread.currentThread();
+ for (Task task : tasks) {
+ final Thread thread = task.thread;
+ if (thread != null && thread != currentThread) {
+ thread.interrupt();
+ }
+ }
+ }
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContextImpl.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import java.util.concurrent.Executor;
+import org.jboss.remoting.ServiceContext;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+final class ServiceContextImpl extends AbstractContextImpl<ServiceContext> implements ServiceContext {
+ private static final Logger log = Logger.getLogger("org.jboss.remoting.service-context");
+
+ protected ServiceContextImpl(final Executor executor) {
+ super(executor);
+ }
+
+ public String toString() {
+ return "service context instance <" + Integer.toHexString(hashCode()) + ">";
+ }
+}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java (from rev 4854, remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceRegistration.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,95 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting.spi.RequestHandlerSource;
+
+/**
+ *
+ */
+final class ServiceRegistration {
+ private final boolean remote;
+ private final String serviceType;
+ private final String groupName;
+ private final String endpointName;
+ private final int metric;
+ private final RequestHandlerSource handlerSource;
+ private volatile SimpleCloseable handle;
+
+ ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final int metric, final RequestHandlerSource handlerSource) {
+ remote = true;
+ this.serviceType = serviceType;
+ this.groupName = groupName;
+ this.endpointName = endpointName;
+ this.metric = metric;
+ this.handlerSource = handlerSource;
+ }
+
+ ServiceRegistration(final String serviceType, final String groupName, final String endpointName, final RequestHandlerSource handlerSource) {
+ remote = false;
+ metric = 0;
+ this.serviceType = serviceType;
+ this.groupName = groupName;
+ this.endpointName = endpointName;
+ this.handlerSource = handlerSource;
+ }
+
+ public boolean matches(final String serviceType, final String groupName, final String endpointName) {
+ return (serviceType == null || serviceType.length() == 0 || serviceType.equals(this.serviceType)) &&
+ (groupName == null || groupName.length() == 0 || groupName.equals(this.groupName)) &&
+ (endpointName == null || endpointName.length() == 0 || endpointName.equals(this.endpointName));
+ }
+
+ public boolean isRemote() {
+ return remote;
+ }
+
+ public String getServiceType() {
+ return serviceType;
+ }
+
+ public String getGroupName() {
+ return groupName;
+ }
+
+ public String getEndpointName() {
+ return endpointName;
+ }
+
+ public int getMetric() {
+ return metric;
+ }
+
+ public RequestHandlerSource getHandlerSource() {
+ return handlerSource;
+ }
+
+ public SimpleCloseable getHandle() {
+ return handle;
+ }
+
+ void setHandle(final SimpleCloseable handle) {
+ this.handle = handle;
+ }
+}
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java (from rev 4853, remoting3/trunk/core/src/test/java/org/jboss/remoting/core/EndpointTestCase.java)
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java (rev 0)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/EndpointTestCase.java 2009-02-26 18:30:20 UTC (rev 4855)
@@ -0,0 +1,277 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting;
+
+import junit.framework.TestCase;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.io.IOException;
+import org.jboss.remoting.AbstractRequestListener;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.IndeterminateOutcomeException;
+import org.jboss.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.spi.RequestHandler;
+import org.jboss.remoting.spi.Handle;
+import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.IoFuture;
+import org.jboss.xnio.log.Logger;
+
+/**
+ *
+ */
+public final class EndpointTestCase extends TestCase {
+ static {
+ LoggingHelper.init();
+ }
+
+ private static final Logger log = Logger.getLogger(EndpointTestCase.class);
+
+ public void testCreate() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "foo");
+ try {
+ endpoint.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testLocalClientInvoke() throws Throwable {
+ final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
+ final AtomicBoolean clientClosed = new AtomicBoolean(false);
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ final Object requestObj = new Object();
+ final Object replyObj = new Object();
+ try {
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ try {
+ context.sendReply(replyObj);
+ } catch (IOException e) {
+ log.error(e, "Error sending reply!");
+ }
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ clientEndpointClosed.set(true);
+ }
+ });
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
+ public void handleClose(final Client<Object, Object> closed) {
+ clientClosed.set(true);
+ }
+ });
+ handle.close();
+ assertEquals(replyObj, client.invoke(requestObj));
+ client.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ assertTrue(clientEndpointClosed.get());
+ assertTrue(clientClosed.get());
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testLocalClientSend() throws Throwable {
+ final AtomicBoolean clientEndpointClosed = new AtomicBoolean(false);
+ final AtomicBoolean clientClosed = new AtomicBoolean(false);
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Object replyObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ try {
+ context.sendReply(replyObj);
+ } catch (IOException e) {
+ log.error(e, "Error sending reply!");
+ }
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ requestHandler.addCloseHandler(new CloseHandler<RequestHandler>() {
+ public void handleClose(final RequestHandler closed) {
+ clientEndpointClosed.set(true);
+ }
+ });
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ client.addCloseHandler(new CloseHandler<Client<Object, Object>>() {
+ public void handleClose(final Client<Object, Object> closed) {
+ clientClosed.set(true);
+ }
+ });
+ handle.close();
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.DONE, futureReply.await(1L, TimeUnit.SECONDS));
+ assertEquals(replyObj, futureReply.get());
+ client.close();
+ executorService.shutdown();
+ assertTrue(executorService.awaitTermination(1L, TimeUnit.SECONDS));
+ assertTrue(clientEndpointClosed.get());
+ assertTrue(clientClosed.get());
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testUnsentReply() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ // don't send a reply!!
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
+ assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+
+ public void testUnsentReply2() throws Throwable {
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+ try {
+ final EndpointImpl endpoint = new EndpointImpl(executorService, "test-endpoint");
+ try {
+ final Object requestObj = new Object();
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(new AbstractRequestListener<Object, Object>() {
+ public void handleRequest(final RequestContext<Object> context, final Object request) throws RemoteExecutionException {
+ assertEquals(request, requestObj);
+ context.execute(new Runnable() {
+ public void run() {
+ context.execute(new Runnable() {
+ public void run() {
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ }
+ });
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ }
+ });
+ context.execute(new Runnable() {
+ public void run() {
+ }
+ });
+ // don't send a reply!!
+ }
+ }, Object.class, Object.class);
+ try {
+ final RequestHandler requestHandler = handle.getResource();
+ try {
+ final Client<Object,Object> client = endpoint.createClient(requestHandler, Object.class, Object.class);
+ try {
+ final IoFuture<? extends Object> futureReply = client.send(requestObj);
+ assertEquals(IoFuture.Status.FAILED, futureReply.await(500L, TimeUnit.MILLISECONDS));
+ assertTrue(futureReply.getException() instanceof IndeterminateOutcomeException);
+ } finally {
+ IoUtils.safeClose(client);
+ }
+ } finally {
+ IoUtils.safeClose(requestHandler);
+ }
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ } finally {
+ IoUtils.safeClose(endpoint);
+ }
+ } finally {
+ executorService.shutdownNow();
+ }
+ }
+}
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2009-02-26 17:58:02 UTC (rev 4854)
+++ remoting3/trunk/build.xml 2009-02-26 18:30:20 UTC (rev 4855)
@@ -216,117 +216,6 @@
<property name="version" value="UNKNOWN"/>
</target>
- <!-- core module -->
-
- <target name="core.compile.depcheck">
- <mkdir dir="core/target/main"/>
- <uptodate property="core.compile.uptodate" targetfile="core/target/main/.lastcompile">
- <srcfiles dir="core/src/main/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="core.compile" depends="core.compile.depcheck" unless="core.compile.uptodate">
- <mkdir dir="core/target/main/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="core/src/main/java"
- destdir="core/target/main/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="api.classpath"/>
- </classpath>
- </javac>
- <touch file="core/target/main/.lastcompile" verbose="false"/>
- </target>
-
- <target name="core.test.compile.depcheck">
- <mkdir dir="core/target/test"/>
- <uptodate property="core.compile.uptodate" targetfile="core/target/test/.lastcompile">
- <srcfiles dir="core/src/test/java">
- <include name="**/"/>
- <include name="**/*.java"/>
- <exclude name="**/.*"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="core.test.compile" depends="lib.junit,core.compile,core.test.compile.depcheck" unless="core.test.compile.uptodate">
- <mkdir dir="core/target/test/classes"/>
- <javac
- source="${javac.source}"
- target="${javac.target}"
- srcdir="core/src/test/java"
- destdir="core/target/test/classes"
- debug="true">
- <compilerarg value="-Xlint:unchecked"/>
- <classpath>
- <path refid="api.classpath"/>
- <path refid="core.classpath"/>
- <path refid="testing-support.classpath"/>
- <pathelement location="${lib.junit.local}"/>
- </classpath>
- </javac>
- <touch file="core/target/test/.lastcompile" verbose="false"/>
- </target>
-
- <target name="core.test.pseudotarget">
- <echo message="============================================="/>
- <echo message="${message}"/>
- <echo message="============================================="/>
- <mkdir dir="core/target/test-results"/>
- <junit printsummary="true" fork="yes" includeantruntime="true">
- <sysproperty key="build.home" value="${basedir}"/>
- <sysproperty key="ant.library.dir" value="${ant.home}/lib"/>
- <sysproperty key="lib.junit.local" value="${lib.junit.local}"/>
- <sysproperty key="lib.marshalling-api.local" value="${lib.marshalling-api.local}"/>
- <sysproperty key="lib.xnio-api.local" value="${lib.xnio-api.local}"/>
- <jvmarg line="${test.jvmargs}"/>
- <formatter type="plain" extension="${extension}"/>
- <classpath>
- <path refid="api.classpath"/>
- <path refid="core.classpath"/>
- <path refid="testing-support.classpath"/>
- <pathelement location="core/target/test/classes"/>
- <path refid="lib.junit.classpath"/>
- </classpath>
- <batchtest fork="yes" todir="core/target/test-results"
- haltonfailure="no">
- <fileset dir="core/target/test/classes">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="core.test" depends="api,core,testing-support,core.test.compile">
- <antcall inheritall="true" inheritrefs="true" target="core.test.pseudotarget">
- <param name="extension" value=".txt"/>
- <param name="message" value="Running with no security manager"/>
- <param name="test.jvmargs" value="-Ddummy=dummy"/>
- </antcall>
- <antcall inheritall="true" inheritrefs="true" target="core.test.pseudotarget">
- <param name="extension" value="-security.txt"/>
- <param name="message" value="Running with security manager"/>
- <param name="test.jvmargs" value="-Djava.security.manager=org.jboss.remoting.test.support.LoggingSecurityManager -Djava.security.policy=${basedir}/testing-support/src/main/resources/testing.policy"/>
- </antcall>
- </target>
-
- <target name="core.clean">
- <delete dir="core/target"/>
- </target>
-
- <target name="core" description="Build the core module" depends="api,core.compile">
- <path id="core.classpath">
- <pathelement location="core/target/main/classes"/>
- </path>
- </target>
-
<!-- samples module -->
<target name="samples.compile.depcheck">
@@ -413,8 +302,8 @@
<!-- ============================================== -->
<target name="api-jar" description="Build the API JAR" depends="api">
- <delete file="jboss-remoting-api.jar"/>
- <jar jarfile="jboss-remoting-api.jar">
+ <delete file="jboss-remoting.jar"/>
+ <jar jarfile="jboss-remoting.jar">
<manifest>
<attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
<attribute name="Specification-Title" value="JBoss Remoting"/>
@@ -433,8 +322,8 @@
</target>
<target name="api-source-jar" description="Build the API source JAR" depends="api">
- <delete file="jboss-remoting-api-source.jar"/>
- <jar jarfile="jboss-remoting-api-source.jar">
+ <delete file="jboss-remoting-source.jar"/>
+ <jar jarfile="jboss-remoting-source.jar">
<manifest>
<attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
<attribute name="Specification-Title" value="JBoss Remoting Source"/>
@@ -452,51 +341,11 @@
</jar>
</target>
- <target name="core-jar" description="Build the Core JAR" depends="core">
- <delete file="jboss-remoting-core.jar"/>
- <jar jarfile="jboss-remoting-core.jar">
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Specification-Title" value="JBoss Remoting"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
- <attribute name="Implementation-Title" value="JBoss Remoting (Core)"/>
- <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
- <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
- </manifest>
- <zipfileset dir="core/target/main/classes">
- <include name="**/*.class"/>
- </zipfileset>
- </jar>
- </target>
-
- <target name="core-source-jar" description="Build the Core source JAR" depends="core">
- <delete file="jboss-remoting-core-source.jar"/>
- <jar jarfile="jboss-remoting-core-source.jar">
- <manifest>
- <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
- <attribute name="Specification-Title" value="JBoss Remoting Source"/>
- <attribute name="Specification-Version" value="${version}"/>
- <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
- <attribute name="Implementation-Title" value="JBoss Remoting Source (Core)"/>
- <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
- <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
- </manifest>
- <zipfileset dir="core/src/main/java">
- <include name="**/*.java"/>
- </zipfileset>
- </jar>
- </target>
-
<!-- ============================================== -->
<!-- JAVADOCS -->
<!-- ============================================== -->
- <target name="api-javadoc" description="Build the API JavaDoc" depends="api,core,lib.apiviz,lib.marshalling-api,lib.xnio-api">
+ <target name="api-javadoc" description="Build the API JavaDoc" depends="api,lib.apiviz,lib.marshalling-api,lib.xnio-api">
<delete dir="api/target/main/docs"/>
<mkdir dir="api/target/main/docs"/>
<javadoc destdir="api/target/main/docs" author="false" version="false" use="false" windowtitle="JBoss Remoting API">
@@ -510,7 +359,6 @@
<link href="http://docs.jboss.org/xnio/1.2.0.GA/api/"/>
<link href="http://docs.jboss.org/river/1.0.0.GA/api/"/>
<classpath>
- <path refid="core.classpath"/>
<path refid="api.classpath"/>
</classpath>
</javadoc>
@@ -532,15 +380,13 @@
<!-- Distribution target -->
<!-- ============================================== -->
- <target name="dist" description="Build distribution zip file" depends="api-jar,api-source-jar,api-javadoc-zip,core-jar,core-source-jar">
+ <target name="dist" description="Build distribution zip file" depends="api-jar,api-source-jar,api-javadoc-zip">
<delete file="jboss-remoting.zip"/>
<zip zipfile="jboss-remoting.zip">
<zipfileset dir="${basedir}">
<include name="COPYING.txt"/>
<include name="jboss-remoting-api.jar"/>
<include name="jboss-remoting-api-source.jar"/>
- <include name="jboss-remoting-core.jar"/>
- <include name="jboss-remoting-core-source.jar"/>
<include name="jboss-remoting-javadoc.zip"/>
</zipfileset>
</zip>
@@ -552,18 +398,18 @@
<!-- core -->
<!--<target name="all-core" description="Build all core targets" depends="api,core,samples,testing-support"/>-->
- <target name="all-core" description="Build all core targets" depends="api,core,testing-support"/>
+ <target name="all-core" description="Build all core targets" depends="api,testing-support"/>
<!-- JARs: These should be the second-to-last targets in the file -->
- <target name="all-jars" description="Build all the JARs" depends="api-jar,core-jar"/>
+ <target name="all-jars" description="Build all the JARs" depends="api-jar"/>
<!-- all: These should be the last targets in the file -->
<target name="all" description="Build everything" depends="all-core,all-jars,api-javadoc"/>
- <target name="clean" description="Clean out all build files" depends="api.clean,core.clean,samples.clean,testing-support.clean"/>
+ <target name="clean" description="Clean out all build files" depends="api.clean,samples.clean,testing-support.clean"/>
- <target name="test" description="Run all tests" depends="api.test,core.test"/>
+ <target name="test" description="Run all tests" depends="api.test"/>
</project>
Modified: remoting3/trunk/testing-support/src/main/resources/testing.policy
===================================================================
--- remoting3/trunk/testing-support/src/main/resources/testing.policy 2009-02-26 17:58:02 UTC (rev 4854)
+++ remoting3/trunk/testing-support/src/main/resources/testing.policy 2009-02-26 18:30:20 UTC (rev 4855)
@@ -4,34 +4,11 @@
grant codeBase "file:${build.home}/api/target/test/classes/-"
{
permission java.lang.RuntimePermission "modifyThread"; // for executor control
-};
-
-grant codeBase "file:${build.home}/core/target/test/classes/-"
-{
- permission java.lang.RuntimePermission "modifyThread"; // for executor control
permission org.jboss.remoting.EndpointPermission "createEndpoint";
permission org.jboss.remoting.EndpointPermission "createRequestHandler";
permission org.jboss.remoting.EndpointPermission "createClient";
};
-grant codeBase "file:${build.home}/protocol/basic/target/test/classes/-"
-{
- permission java.lang.RuntimePermission "modifyThread"; // for executor control
- permission org.jboss.remoting.EndpointPermission "createEndpoint";
- permission org.jboss.remoting.EndpointPermission "createRequestHandler";
- permission org.jboss.remoting.EndpointPermission "createClient";
-};
-
-grant codeBase "file:${build.home}/protocol/multiplex/target/test/classes/-"
-{
- permission java.lang.RuntimePermission "modifyThread"; // for executor control
- permission org.jboss.remoting.EndpointPermission "createEndpoint";
- permission org.jboss.remoting.EndpointPermission "createRequestHandler";
- permission org.jboss.remoting.EndpointPermission "createClient";
- permission org.jboss.remoting.EndpointPermission "createClientSource";
- permission org.jboss.remoting.EndpointPermission "registerService";
-};
-
// Permissions for Remoting itself
grant codeBase "file:${build.home}/api/target/main/classes/-"
@@ -40,17 +17,6 @@
permission org.jboss.remoting.EndpointPermission "*";
};
-grant codeBase "file:${build.home}/core/target/main/classes/-"
-{
- permission java.util.PropertyPermission "jboss.remoting.*", "read";
- permission org.jboss.remoting.EndpointPermission "*";
-};
-
-grant codeBase "file:${build.home}/protocol/basic/target/main/classes/-"
-{
- permission java.util.PropertyPermission "jboss.remoting.*", "read";
-};
-
// Support classes
grant codeBase "file:${build.home}/testing-support/target/main/classes/-"
15 years, 9 months
- 1
- 0
JBoss Remoting SVN: r4854 - remoting3/trunk/core/src/main/java/org/jboss/remoting/core.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2009-02-26 12:58:02 -0500 (Thu, 26 Feb 2009)
New Revision: 4854
Modified:
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientExternalizer.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceExternalizer.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ConcurrentReferenceHashMap.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/OrderedExecutor.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/QueueExecutor.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestListenerExecutor.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java
Log:
public -> package private
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -30,11 +30,11 @@
/**
*
*/
-public abstract class AbstractContextImpl<T> extends AbstractHandleableCloseable<T> {
+abstract class AbstractContextImpl<T> extends AbstractHandleableCloseable<T> {
private final ConcurrentMap<Object, Object> attributes = new ConcurrentHashMap<Object, Object>();
- protected AbstractContextImpl(final Executor executor) {
+ AbstractContextImpl(final Executor executor) {
super(executor);
}
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -30,7 +30,7 @@
/**
*
*/
-public final class ClientContextImpl extends AbstractContextImpl<ClientContext> implements ClientContext {
+final class ClientContextImpl extends AbstractContextImpl<ClientContext> implements ClientContext {
private static final Logger log = Logger.getLogger("org.jboss.remoting.client-context");
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientExternalizer.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientExternalizer.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientExternalizer.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -32,7 +32,7 @@
/**
*
*/
-public final class ClientExternalizer implements Externalizer {
+final class ClientExternalizer implements Externalizer {
private static final long serialVersionUID = 814228455390899997L;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -28,7 +28,6 @@
import org.jboss.remoting.CloseHandler;
import org.jboss.remoting.IndeterminateOutcomeException;
import org.jboss.remoting.RemoteRequestException;
-import org.jboss.remoting.core.QueueExecutor;
import org.jboss.remoting.spi.Handle;
import org.jboss.remoting.spi.RemoteRequestContext;
import org.jboss.remoting.spi.ReplyHandler;
@@ -40,7 +39,7 @@
/**
*
*/
-public final class ClientImpl<I, O> extends AbstractContextImpl<Client<I, O>> implements Client<I, O> {
+final class ClientImpl<I, O> extends AbstractContextImpl<Client<I, O>> implements Client<I, O> {
private static final Logger log = Logger.getLogger("org.jboss.remoting.client");
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceExternalizer.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceExternalizer.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceExternalizer.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -32,7 +32,7 @@
/**
*
*/
-public final class ClientSourceExternalizer implements Externalizer {
+final class ClientSourceExternalizer implements Externalizer {
private static final long serialVersionUID = 814228455390899997L;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -37,7 +37,7 @@
/**
*
*/
-public final class ClientSourceImpl<I, O> extends AbstractHandleableCloseable<ClientSource<I, O>> implements ClientSource<I, O> {
+final class ClientSourceImpl<I, O> extends AbstractHandleableCloseable<ClientSource<I, O>> implements ClientSource<I, O> {
private static final Logger log = Logger.getLogger("org.jboss.remoting.client-source");
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ConcurrentReferenceHashMap.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ConcurrentReferenceHashMap.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ConcurrentReferenceHashMap.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -124,7 +124,7 @@
* @param <K> the type of keys maintained by this map
* @param <V> the type of mapped values
*/
-public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
+class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
implements java.util.concurrent.ConcurrentMap<K, V>, Serializable {
private static final long serialVersionUID = 7249069246763182397L;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -40,7 +40,7 @@
/**
*
*/
-public final class EndpointImpl extends AbstractHandleableCloseable<Endpoint> implements Endpoint {
+final class EndpointImpl extends AbstractHandleableCloseable<Endpoint> implements Endpoint {
static {
// Print Remoting "greeting" message
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -32,7 +32,7 @@
/**
*
*/
-public final class FutureClientSource<I, O> extends AbstractIoFuture<ClientSource<I, O>> {
+final class FutureClientSource<I, O> extends AbstractIoFuture<ClientSource<I, O>> {
private volatile SimpleCloseable listenerHandle;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -33,14 +33,14 @@
/**
*
*/
-public final class FutureReplyImpl<O> extends AbstractIoFuture<O> {
+final class FutureReplyImpl<O> extends AbstractIoFuture<O> {
private final Executor executor;
private final Class<O> replyType;
private final ReplyHandler replyHandler = new Handler();
private volatile RemoteRequestContext remoteRequestContext;
- public FutureReplyImpl(final Executor executor, final Class<O> replyType) {
+ FutureReplyImpl(final Executor executor, final Class<O> replyType) {
this.executor = executor;
this.replyType = replyType;
}
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -38,7 +38,7 @@
/**
*
*/
-public final class LocalRequestHandler<I, O> extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
+final class LocalRequestHandler<I, O> extends AbstractAutoCloseable<RequestHandler> implements RequestHandler {
private final RequestListener<I, O> requestListener;
private final ClientContextImpl clientContext;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -35,7 +35,7 @@
/**
*
*/
-public final class LocalRequestHandlerSource<I, O> extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
+final class LocalRequestHandlerSource<I, O> extends AbstractAutoCloseable<RequestHandlerSource> implements RequestHandlerSource {
private final RequestListener<I, O> requestListener;
private final ServiceContextImpl serviceContext;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/OrderedExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/OrderedExecutor.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/OrderedExecutor.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -32,7 +32,7 @@
* More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
* same method, will result in B's task running after A's.
*/
-public final class OrderedExecutor implements Executor {
+final class OrderedExecutor implements Executor {
private static final Logger log = Logger.getLogger(OrderedExecutor.class);
// @protectedby tasks
@@ -47,7 +47,7 @@
*
* @param parent the parent executor
*/
- public OrderedExecutor(final Executor parent) {
+ OrderedExecutor(final Executor parent) {
this.parent = parent;
runner = new Runnable() {
public void run() {
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/QueueExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/QueueExecutor.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/QueueExecutor.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -11,7 +11,7 @@
* Only one thread should invoke the {@code runQueue()} method, which will run until the executor is
* shut down.
*/
-public final class QueueExecutor implements CloseableExecutor {
+final class QueueExecutor implements CloseableExecutor {
private static final Logger log = org.jboss.xnio.log.Logger.getLogger(QueueExecutor.class);
private final Queue<Runnable> queue = new LinkedList<Runnable>();
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -40,7 +40,7 @@
/**
*
*/
-public final class RequestContextImpl<O> implements RequestContext<O> {
+final class RequestContextImpl<O> implements RequestContext<O> {
private final AtomicBoolean closed = new AtomicBoolean();
private final Object cancelLock = new Object();
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestListenerExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestListenerExecutor.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestListenerExecutor.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -30,7 +30,7 @@
/**
*
*/
-public final class RequestListenerExecutor implements Executor {
+final class RequestListenerExecutor implements Executor {
private final Set<Task> tasks = Collections.synchronizedSet(new HashSet<Task>());
private final Executor executor;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -29,7 +29,7 @@
/**
*
*/
-public final class ServiceContextImpl extends AbstractContextImpl<ServiceContext> implements ServiceContext {
+final class ServiceContextImpl extends AbstractContextImpl<ServiceContext> implements ServiceContext {
private static final Logger log = Logger.getLogger("org.jboss.remoting.service-context");
protected ServiceContextImpl(final Executor executor) {
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java 2009-02-26 02:48:28 UTC (rev 4853)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java 2009-02-26 17:58:02 UTC (rev 4854)
@@ -28,7 +28,7 @@
/**
*
*/
-public final class ServiceRegistration {
+final class ServiceRegistration {
private final boolean remote;
private final String serviceType;
private final String groupName;
15 years, 9 months
- 1
- 0