You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/26 18:57:37 UTC
svn commit: r699408 - in
/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src:
main/java/org/apache/geronimo/gshell/whisper/transport/
main/java/org/apache/geronimo/gshell/whisper/transport/base/
main/java/org/apache/geronimo/gshell/whisper/transpor...
Author: jdillon
Date: Fri Sep 26 09:57:36 2008
New Revision: 699408
URL: http://svn.apache.org/viewvc?rev=699408&view=rev
Log:
Drop the Transport.Configuration and TransportServer.Configuration muck
Modified:
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Session.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Transport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportServer.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionBindingFilter.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/ThreadPoolModel.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpAddressFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmAddressFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/util/NamedThreadFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Session.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Session.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Session.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Session.java Fri Sep 26 09:57:36 2008
@@ -19,16 +19,16 @@
package org.apache.geronimo.gshell.whisper.transport;
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.OutputStream;
-
+import org.apache.geronimo.gshell.chronos.Duration;
import org.apache.geronimo.gshell.whisper.message.Message;
import org.apache.geronimo.gshell.whisper.util.SessionAttributeBinder;
-import org.apache.geronimo.gshell.chronos.Duration;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.WriteFuture;
+import java.io.Closeable;
+import java.io.InputStream;
+import java.io.OutputStream;
+
/**
* Provides the session for a transport connection.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Transport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Transport.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Transport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/Transport.java Fri Sep 26 09:57:36 2008
@@ -19,14 +19,13 @@
package org.apache.geronimo.gshell.whisper.transport;
-import java.io.Closeable;
-import java.net.URI;
-import java.util.EventListener;
-
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.ThreadModel;
+import java.io.Closeable;
+import java.net.URI;
+
/**
* Provides the client-side protocol interface.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactory.java Fri Sep 26 09:57:36 2008
@@ -19,10 +19,10 @@
package org.apache.geronimo.gshell.whisper.transport;
-import java.net.URI;
-
import org.apache.mina.common.IoHandler;
+import java.net.URI;
+
//
// FIXME: This won't compile under Java 6 due to the T. and S. bits (trying to select from a type variable)
//
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorImpl.java Fri Sep 26 09:57:36 2008
@@ -24,9 +24,9 @@
import javax.annotation.PostConstruct;
import java.net.URI;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.HashMap;
/**
* Helper to locate a {@link TransportFactory} instance.
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportServer.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportServer.java Fri Sep 26 09:57:36 2008
@@ -19,14 +19,13 @@
package org.apache.geronimo.gshell.whisper.transport;
-import java.io.Closeable;
-import java.net.URI;
-import java.util.EventListener;
-
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.ThreadModel;
+import java.io.Closeable;
+import java.net.URI;
+
/**
* Provides the server-side protocol interface.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java Fri Sep 26 09:57:36 2008
@@ -179,6 +179,10 @@
chain.addLast(ProtocolCodecFilter.class.getSimpleName(), new ProtocolCodecFilter(new ObjectSerializationCodecFactory()));
+ //
+ // FIXME: Need to create a custom LoggingFilter which logs things as debug and trace, not info, PITA
+ //
+
chain.addLast(LoggingFilter.class.getSimpleName(), new LoggingFilter());
chain.addLast(SessionStreamFilter.class.getSimpleName(), new SessionStreamFilter());
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java Fri Sep 26 09:57:36 2008
@@ -19,10 +19,6 @@
package org.apache.geronimo.gshell.whisper.transport.base;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.geronimo.gshell.whisper.transport.Session;
import org.apache.geronimo.gshell.whisper.transport.Transport;
import org.apache.geronimo.gshell.whisper.util.SessionAttributeBinder;
@@ -33,6 +29,10 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.common.ThreadModel;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Support for {@link Transport} implementations.
*
@@ -66,16 +66,18 @@
// Configuration
//
- protected static class BaseTransportConfiguration
+ public static class BaseTransportConfiguration
extends BaseConfiguration
implements Transport.Configuration
{
- // TODO:
+ public BaseTransportConfiguration() {}
}
private Configuration config;
- protected abstract Configuration createConfiguration();
+ protected Configuration createConfiguration() {
+ return new BaseTransportConfiguration();
+ }
public synchronized Configuration getConfiguration() {
if (config == null) {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportFactory.java Fri Sep 26 09:57:36 2008
@@ -19,15 +19,15 @@
package org.apache.geronimo.gshell.whisper.transport.base;
-import java.net.URI;
-
+import org.apache.geronimo.gshell.spring.BeanContainer;
+import org.apache.geronimo.gshell.spring.BeanContainerAware;
import org.apache.geronimo.gshell.whisper.transport.Transport;
import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
import org.apache.geronimo.gshell.whisper.transport.TransportServer;
-import org.apache.geronimo.gshell.spring.BeanContainerAware;
-import org.apache.geronimo.gshell.spring.BeanContainer;
import org.apache.mina.common.IoHandler;
+import java.net.URI;
+
/**
* Support for {@link TransportFactory} implementations.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java Fri Sep 26 09:57:36 2008
@@ -19,15 +19,15 @@
package org.apache.geronimo.gshell.whisper.transport.base;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.geronimo.gshell.whisper.transport.TransportServer;
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.ThreadModel;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Support for {@link TransportServer} implementations.
*
@@ -53,16 +53,18 @@
// Configuration
//
- protected static class BaseTransportServerConfiguration
+ public static class BaseTransportServerConfiguration
extends BaseConfiguration
implements TransportServer.Configuration
{
- // TODO:
+ public BaseTransportServerConfiguration() {}
}
private Configuration config;
- protected abstract Configuration createConfiguration();
+ protected Configuration createConfiguration() {
+ return new BaseTransportServerConfiguration();
+ }
public synchronized Configuration getConfiguration() {
if (config == null) {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionBindingFilter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionBindingFilter.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionBindingFilter.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionBindingFilter.java Fri Sep 26 09:57:36 2008
@@ -40,7 +40,7 @@
public void sessionCreated(final NextFilter nextFilter, final IoSession session) throws Exception {
Session s = Session.BINDER.bind(session, new SessionAdapter(session));
- log.debug("Bound: {}", s);
+ log.trace("Bound: {}", s);
nextFilter.sessionCreated(session);
}
@@ -49,7 +49,7 @@
public void sessionClosed(final NextFilter nextFilter, final IoSession session) throws Exception {
Session s = Session.BINDER.unbind(session);
- log.debug("Unbound: {}", s);
+ log.trace("Unbound: {}", s);
nextFilter.sessionClosed(session);
}
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/ThreadPoolModel.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/ThreadPoolModel.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/ThreadPoolModel.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/ThreadPoolModel.java Fri Sep 26 09:57:36 2008
@@ -19,13 +19,6 @@
package org.apache.geronimo.gshell.whisper.transport.base;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
import org.apache.geronimo.gshell.whisper.util.NamedThreadFactory;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.ThreadModel;
@@ -33,6 +26,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* A custom {@link ThreadModel} to get some more control over the pool configuration as well as how threads are constructed.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransport.java Fri Sep 26 09:57:36 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.whisper.transport.ssl;
import org.apache.geronimo.gshell.whisper.ssl.SSLContextFactory;
-import org.apache.geronimo.gshell.whisper.transport.Transport;
import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransport;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.filter.SSLFilter;
@@ -58,14 +57,4 @@
chain.addFirst(SSLFilter.class.getSimpleName(), filter);
}
-
- protected Transport.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportFactory.java Fri Sep 26 09:57:36 2008
@@ -20,8 +20,6 @@
package org.apache.geronimo.gshell.whisper.transport.ssl;
import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportFactory;
-import org.apache.geronimo.gshell.whisper.transport.base.BaseTransport;
-import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
/**
* Produces TCP+SSL transport instances.
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SslTransportServer.java Fri Sep 26 09:57:36 2008
@@ -20,7 +20,6 @@
package org.apache.geronimo.gshell.whisper.transport.ssl;
import org.apache.geronimo.gshell.whisper.ssl.SSLContextFactory;
-import org.apache.geronimo.gshell.whisper.transport.TransportServer;
import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportServer;
import org.apache.mina.common.DefaultIoFilterChainBuilder;
import org.apache.mina.filter.SSLFilter;
@@ -57,14 +56,4 @@
chain.addFirst(SSLFilter.class.getSimpleName(), sslFilter);
}
-
- protected TransportServer.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportServerConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpAddressFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpAddressFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpAddressFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpAddressFactory.java Fri Sep 26 09:57:36 2008
@@ -19,12 +19,12 @@
package org.apache.geronimo.gshell.whisper.transport.tcp;
+import org.apache.geronimo.gshell.whisper.transport.base.AddressFactory;
+
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI;
-import org.apache.geronimo.gshell.whisper.transport.base.AddressFactory;
-
/**
* Produces TCP address instances.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransport.java Fri Sep 26 09:57:36 2008
@@ -19,13 +19,12 @@
package org.apache.geronimo.gshell.whisper.transport.tcp;
-import java.util.concurrent.Executors;
-
-import org.apache.geronimo.gshell.whisper.transport.Transport;
import org.apache.geronimo.gshell.whisper.transport.base.AddressFactory;
import org.apache.geronimo.gshell.whisper.transport.base.BaseTransport;
import org.apache.mina.transport.socket.nio.SocketConnector;
+import java.util.concurrent.Executors;
+
/**
* Provides TCP client-side support.
*
@@ -46,14 +45,4 @@
protected SocketConnector createConnector() throws Exception {
return new SocketConnector(Runtime.getRuntime().availableProcessors() + 1, Executors.newCachedThreadPool());
}
-
- protected Transport.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/TcpTransportServer.java Fri Sep 26 09:57:36 2008
@@ -19,13 +19,12 @@
package org.apache.geronimo.gshell.whisper.transport.tcp;
-import java.util.concurrent.Executors;
-
-import org.apache.geronimo.gshell.whisper.transport.TransportServer;
import org.apache.geronimo.gshell.whisper.transport.base.AddressFactory;
import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
+import java.util.concurrent.Executors;
+
/**
* Provides TCP server-side support.
*
@@ -46,14 +45,4 @@
protected SocketAcceptor createAcceptor() throws Exception {
return new SocketAcceptor(Runtime.getRuntime().availableProcessors() + 1, Executors.newCachedThreadPool());
}
-
- protected TransportServer.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportServerConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmAddressFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmAddressFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmAddressFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmAddressFactory.java Fri Sep 26 09:57:36 2008
@@ -19,11 +19,11 @@
package org.apache.geronimo.gshell.whisper.transport.vm;
-import java.net.URI;
-
import org.apache.geronimo.gshell.whisper.transport.base.AddressFactory;
import org.apache.mina.transport.vmpipe.VmPipeAddress;
+import java.net.URI;
+
/**
* Produces in-VM address instances.
*
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransport.java Fri Sep 26 09:57:36 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.whisper.transport.vm;
-import org.apache.geronimo.gshell.whisper.transport.Transport;
import org.apache.geronimo.gshell.whisper.transport.base.BaseTransport;
import org.apache.mina.transport.vmpipe.VmPipeConnector;
@@ -39,14 +38,4 @@
protected VmPipeConnector createConnector() throws Exception {
return new VmPipeConnector();
}
-
- protected Transport.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactory.java Fri Sep 26 09:57:36 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.whisper.transport.vm;
-import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportFactory;
/**
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportServer.java Fri Sep 26 09:57:36 2008
@@ -19,7 +19,6 @@
package org.apache.geronimo.gshell.whisper.transport.vm;
-import org.apache.geronimo.gshell.whisper.transport.TransportServer;
import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
import org.apache.mina.transport.vmpipe.VmPipeAcceptor;
@@ -39,14 +38,4 @@
protected VmPipeAcceptor createAcceptor() throws Exception {
return new VmPipeAcceptor();
}
-
- protected TransportServer.Configuration createConfiguration() {
- return new Configuration();
- }
-
- public static class Configuration
- extends BaseTransportServerConfiguration
- {
- // TODO:
- }
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/util/NamedThreadFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/util/NamedThreadFactory.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/util/NamedThreadFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/util/NamedThreadFactory.java Fri Sep 26 09:57:36 2008
@@ -19,6 +19,9 @@
package org.apache.geronimo.gshell.whisper.util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
@@ -31,6 +34,8 @@
public class NamedThreadFactory
implements ThreadFactory
{
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
private final String baseName;
private final ThreadGroup group;
@@ -76,18 +81,20 @@
public Thread newThread(final Runnable task) {
assert task != null;
- Thread t = new Thread(group, task, createName());
-
- configure(t);
+ Thread thread = new Thread(group, task, createName());
+
+ log.trace("Created new thread: {}", thread);
+
+ configure(thread);
- return t;
+ return thread;
}
protected String createName() {
return baseName + "-" + counter.getAndIncrement();
}
- protected void configure(final Thread t) {
- t.setDaemon(true);
+ protected void configure(final Thread thread) {
+ thread.setDaemon(true);
}
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java?rev=699408&r1=699407&r2=699408&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java Fri Sep 26 09:57:36 2008
@@ -24,6 +24,7 @@
import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
import org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocator;
import org.apache.geronimo.gshell.whisper.transport.TransportServer;
+import org.apache.geronimo.gshell.whisper.transport.base.BaseTransportServer;
import org.apache.geronimo.gshell.spring.SpringTestSupport;
import org.apache.mina.common.IoHandlerAdapter;
@@ -55,7 +56,7 @@
}
public void testBindWithConfig() throws Exception {
- VmTransportServer.Configuration config = new VmTransportServer.Configuration();
+ VmTransportServer.Configuration config = new BaseTransportServer.BaseTransportServerConfiguration();
config.setHandler(new IoHandlerAdapter());
TransportServer server = factory.bind(uri, config);