geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r699454 - in /geronimo/gshell/trunk/gshell-remote/gshell-whisper/src: main/java/org/apache/geronimo/gshell/whisper/request/ main/java/org/apache/geronimo/gshell/whisper/ssl/ main/java/org/apache/geronimo/gshell/whisper/stream/ main/java/org...
Date Fri, 26 Sep 2008 19:05:13 GMT
Author: jdillon
Date: Fri Sep 26 12:05:12 2008
New Revision: 699454

URL: http://svn.apache.org/viewvc?rev=699454&view=rev
Log:
Finished removing the Transport.Configuration and TransportServer.Configuration bits, just
using BaseConfiguration for everything
(pending a complete rewrite of all this stuff to expose all configuration via spring)

Modified:
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/SSLContextFactory.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamFeeder.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamMessage.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/TransportServer.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseConfiguration.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/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.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/request/Requestor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/Requestor.java
Fri Sep 26 12:05:12 2008
@@ -19,8 +19,6 @@
 
 package org.apache.geronimo.gshell.whisper.request;
 
-import java.util.concurrent.TimeUnit;
-
 import org.apache.geronimo.gshell.chronos.Duration;
 import org.apache.geronimo.gshell.whisper.message.Message;
 import org.apache.geronimo.gshell.whisper.transport.Session;
@@ -30,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Provides support to send a request and receive it's response.
  *

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/BogusSSLContextFactory.java
Fri Sep 26 12:05:12 2008
@@ -23,6 +23,17 @@
 
 package org.apache.geronimo.gshell.whisper.ssl;
 
+import org.codehaus.plexus.util.IOUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.PostConstruct;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactorySpi;
+import javax.net.ssl.X509TrustManager;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -33,18 +44,6 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.ManagerFactoryParameters;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactorySpi;
-import javax.net.ssl.X509TrustManager;
-import javax.annotation.PostConstruct;
-
-import org.codehaus.plexus.util.IOUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Factory to create a bougus SSLContext.
  *

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/SSLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/SSLContextFactory.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/SSLContextFactory.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/ssl/SSLContextFactory.java
Fri Sep 26 12:05:12 2008
@@ -23,9 +23,8 @@
 
 package org.apache.geronimo.gshell.whisper.ssl;
 
-import java.security.GeneralSecurityException;
-
 import javax.net.ssl.SSLContext;
+import java.security.GeneralSecurityException;
 
 /**
  * Provides an abstraction of client and server {@link SSLContext} creation.

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamFeeder.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamFeeder.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamFeeder.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamFeeder.java
Fri Sep 26 12:05:12 2008
@@ -19,13 +19,13 @@
 
 package org.apache.geronimo.gshell.whisper.stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Feeds data from an input stream to an output stream.
  *

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamMessage.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamMessage.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamMessage.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/stream/StreamMessage.java
Fri Sep 26 12:05:12 2008
@@ -19,14 +19,14 @@
 
 package org.apache.geronimo.gshell.whisper.stream;
 
+import org.apache.geronimo.gshell.whisper.message.BaseMessage;
+import org.apache.mina.common.ByteBuffer;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.geronimo.gshell.whisper.message.BaseMessage;
-import org.apache.mina.common.ByteBuffer;
-
 /**
  * Write a buffer to a stream.
  *

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -19,9 +19,8 @@
 
 package org.apache.geronimo.gshell.whisper.transport;
 
+import org.apache.geronimo.gshell.whisper.transport.base.BaseConfiguration;
 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;
@@ -44,22 +43,7 @@
 
     void close();
 
-    //
-    // Configuration
-    //
+    void setConfiguration(BaseConfiguration config);
 
-    void setConfiguration(Configuration config);
-
-    Configuration getConfiguration();
-
-    interface Configuration
-    {
-        IoHandler getHandler();
-
-        void setHandler(IoHandler handler);
-
-        ThreadModel getThreadModel();
-
-        void setThreadModel(ThreadModel threadModel);
-    }
+    BaseConfiguration getConfiguration();
 }
\ No newline at end of file

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -19,28 +19,25 @@
 
 package org.apache.geronimo.gshell.whisper.transport;
 
+import org.apache.geronimo.gshell.whisper.transport.base.BaseConfiguration;
 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)
-//
-
 /**
  * Factory for producing client and server transport implementations.
  *
  * @version $Rev$ $Date$
  */
-public interface TransportFactory<T extends Transport, TC extends T.Configuration, S extends
TransportServer, SC extends S.Configuration>
+public interface TransportFactory<T extends Transport, S extends TransportServer>
 {
     String getScheme();
     
-    T connect(URI remote, URI local, TC config) throws Exception;
+    T connect(URI remote, URI local, BaseConfiguration config) throws Exception;
 
     T connect(URI remote, URI local, IoHandler handler) throws Exception;
     
-    S bind(URI location, SC config) throws Exception;
+    S bind(URI location, BaseConfiguration config) throws Exception;
 
     S bind(URI location, IoHandler handler) throws Exception;
 }
\ No newline at end of file

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -19,9 +19,8 @@
 
 package org.apache.geronimo.gshell.whisper.transport;
 
+import org.apache.geronimo.gshell.whisper.transport.base.BaseConfiguration;
 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;
@@ -40,22 +39,7 @@
 
     void close();
 
-    //
-    // Configuration
-    //
+    void setConfiguration(BaseConfiguration config);
 
-    void setConfiguration(Configuration config);
-
-    Configuration getConfiguration();
-
-    interface Configuration
-    {
-        IoHandler getHandler();
-
-        void setHandler(IoHandler hanlder);
-
-        ThreadModel getThreadModel();
-
-        void setThreadModel(ThreadModel threadModel);
-    }
+    BaseConfiguration getConfiguration();
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseConfiguration.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseConfiguration.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseConfiguration.java
Fri Sep 26 12:05:12 2008
@@ -34,8 +34,6 @@
 
     private ThreadModel threadModel;
 
-    protected BaseConfiguration() {}
-
     public void setHandler(final IoHandler handler) {
         this.handler = handler;
     }
@@ -55,8 +53,4 @@
     public String toString() {
         return Yarn.render(this);
     }
-
-    //
-    // TODO: Add a list of filters to tack on
-    //
 }

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -48,7 +48,7 @@
  *
  * @version $Rev$ $Date$
  */
-public abstract class BaseService<T extends IoService>
+public abstract class BaseService
 {
     static {
         // Setup our exception monitor
@@ -75,12 +75,34 @@
     // Configuration
     //
 
-    protected abstract BaseConfiguration getBaseConfiguration();
+    private BaseConfiguration config;
+
+    protected BaseConfiguration createConfiguration() {
+        return new BaseConfiguration();
+    }
+
+    public synchronized BaseConfiguration getConfiguration() {
+        if (config == null) {
+            config = createConfiguration();
+
+            log.debug("Created configuration: {}", config);
+        }
+
+        return config;
+    }
+
+    public synchronized void setConfiguration(final BaseConfiguration config) {
+        assert config != null;
+
+        this.config = config;
+
+        log.debug("Using configuration: {}", config);
+    }
 
     private IoHandler handler;
 
     protected synchronized IoHandler createHandler() throws Exception {
-        return getBaseConfiguration().getHandler();
+        return getConfiguration().getHandler();
     }
 
     protected synchronized IoHandler getHandler() throws Exception {

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -62,44 +62,6 @@
         super(addressFactory);
     }
 
-    //
-    // Configuration
-    //
-
-    public static class BaseTransportConfiguration
-        extends BaseConfiguration
-        implements Transport.Configuration
-    {
-        public BaseTransportConfiguration() {}
-    }
-
-    private Configuration config;
-
-    protected Configuration createConfiguration() {
-        return new BaseTransportConfiguration();
-    }
-
-    public synchronized Configuration getConfiguration() {
-        if (config == null) {
-            config = createConfiguration();
-        }
-
-        return config;
-    }
-
-    public synchronized void setConfiguration(final Configuration config) {
-        assert config != null;
-
-        this.config = config;
-
-        log.debug("Using configuration: {}", config);
-    }
-
-    @Override
-    protected synchronized BaseConfiguration getBaseConfiguration() {
-        return (BaseConfiguration) getConfiguration();
-    }
-
     @Override
     protected synchronized ThreadModel createThreadModel() throws Exception {
         return new ThreadPoolModel(getClass(), INSTANCE_COUNTER);

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -33,7 +33,7 @@
  *
  * @version $Rev$ $Date$
  */
-public abstract class BaseTransportFactory<T extends BaseTransport, TC extends Transport.Configuration,
S extends BaseTransportServer, SC extends TransportServer.Configuration>
+public abstract class BaseTransportFactory<T extends BaseTransport, S extends BaseTransportServer>
     implements TransportFactory, BeanContainerAware
 {
     private final String scheme;
@@ -65,7 +65,7 @@
         return (T)container.getBean(scheme + "Transport", Transport.class);
     }
 
-    public T connect(final URI remote, final URI local, final TC config) throws Exception
{
+    public T connect(final URI remote, final URI local, final BaseConfiguration config) throws
Exception {
         assert remote != null;
         assert config != null;
         // local can be null
@@ -98,7 +98,7 @@
         return (S)container.getBean(scheme + "TransportServer", TransportServer.class);
     }
 
-    public S bind(final URI location, final SC config) throws Exception {
+    public S bind(final URI location, final BaseConfiguration config) throws Exception {
         assert location != null;
         assert config != null;
 

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -49,44 +49,6 @@
         super(addressFactory);
     }
 
-    //
-    // Configuration
-    //
-
-    public static class BaseTransportServerConfiguration
-        extends BaseConfiguration
-        implements TransportServer.Configuration
-    {
-        public BaseTransportServerConfiguration() {}
-    }
-
-    private Configuration config;
-
-    protected Configuration createConfiguration() {
-        return new BaseTransportServerConfiguration();    
-    }
-
-    public synchronized Configuration getConfiguration() {
-        if (config == null) {
-            config = createConfiguration();
-        }
-
-        return config;
-    }
-
-    public synchronized void setConfiguration(final Configuration config) {
-        assert config != null;
-        
-        this.config = config;
-
-        log.debug("Using configuration: {}", config);
-    }
-
-    @Override
-    protected synchronized BaseConfiguration getBaseConfiguration() {
-        return (BaseConfiguration) getConfiguration();
-    }
-
     @Override
     protected synchronized ThreadModel createThreadModel() throws Exception {
         return new ThreadPoolModel(getClass(), INSTANCE_COUNTER);

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
Fri Sep 26 12:05:12 2008
@@ -19,19 +19,19 @@
 
 package org.apache.geronimo.gshell.whisper.message;
 
-import java.net.URI;
-import java.util.Map;
-
+import org.apache.geronimo.gshell.spring.SpringTestSupport;
 import org.apache.geronimo.gshell.whisper.transport.Session;
 import org.apache.geronimo.gshell.whisper.transport.Transport;
 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.spring.SpringTestSupport;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.demux.DemuxingIoHandler;
 import org.apache.mina.handler.demux.MessageHandler;
 
+import java.net.URI;
+import java.util.Map;
+
 /**
  * Tests a simple PING -> PONG message protocol over the VM transport.
  *

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java?rev=699454&r1=699453&r2=699454&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java
(original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java
Fri Sep 26 12:05:12 2008
@@ -19,12 +19,12 @@
 
 package org.apache.geronimo.gshell.whisper.transport;
 
-import java.net.URI;
-
+import org.apache.geronimo.gshell.spring.SpringTestSupport;
 import org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.vm.VmTransportFactory;
-import org.apache.geronimo.gshell.spring.SpringTestSupport;
+
+import java.net.URI;
 
 /**
  * Tests for the {@link TransportFactoryLocator} class.

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=699454&r1=699453&r2=699454&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 12:05:12 2008
@@ -19,15 +19,15 @@
 
 package org.apache.geronimo.gshell.whisper.transport.vm;
 
-import java.net.URI;
-
+import org.apache.geronimo.gshell.spring.SpringTestSupport;
 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.geronimo.gshell.whisper.transport.base.BaseConfiguration;
 import org.apache.mina.common.IoHandlerAdapter;
 
+import java.net.URI;
+
 /**
  * Tests for the {@link VmTransportFactory} class.
  *
@@ -56,7 +56,7 @@
     }
 
     public void testBindWithConfig() throws Exception {
-        VmTransportServer.Configuration config = new BaseTransportServer.BaseTransportServerConfiguration();
+        BaseConfiguration config = new BaseConfiguration();
         config.setHandler(new IoHandlerAdapter());
 
         TransportServer server = factory.bind(uri, config);



Mime
View raw message