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/22 10:12:19 UTC
svn commit: r697695 - in
/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main:
java/org/apache/geronimo/gshell/whisper/request/
java/org/apache/geronimo/gshell/whisper/transport/
java/org/apache/geronimo/gshell/whisper/transport/base/ java/org/...
Author: jdillon
Date: Mon Sep 22 01:12:18 2008
New Revision: 697695
URL: http://svn.apache.org/viewvc?rev=697695&view=rev
Log:
Configure the sslContextFactory explicitly, hook up the bogus one for now
Tidy up some whisper things
Modified:
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestException.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/InvalidLocationException.java
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/TransportExceptionMonitor.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/base/AddressFactory.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/BaseTransportFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionAdapter.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/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/vm/VmAddressFactory.java
geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestException.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestException.java?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestException.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/request/RequestException.java Mon Sep 22 01:12:18 2008
@@ -22,7 +22,7 @@
import org.apache.geronimo.gshell.whisper.message.Message;
/**
- * ???
+ * Thrown to indicate a request failure.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/InvalidLocationException.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/InvalidLocationException.java?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/InvalidLocationException.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/InvalidLocationException.java Mon Sep 22 01:12:18 2008
@@ -22,7 +22,7 @@
import java.net.URI;
/**
- * ???
+ * Thrown to indicate an invalid transport location was configured.
*
* @version $Rev$ $Date$
*/
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -30,7 +30,7 @@
import org.apache.mina.common.WriteFuture;
/**
- * ???
+ * Provides the session for a transport connection.
*
* @version $Rev$ $Date$
*/
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportExceptionMonitor.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportExceptionMonitor.java?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportExceptionMonitor.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/TransportExceptionMonitor.java Mon Sep 22 01:12:18 2008
@@ -24,7 +24,7 @@
import org.slf4j.LoggerFactory;
/**
- * ???
+ * Logging exception monitor.
*
* @version $Rev$ $Date$
*/
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -39,18 +39,8 @@
T connect(URI remote, URI local, TC config) throws Exception;
T connect(URI remote, URI local, IoHandler handler) throws Exception;
-
- /*
- Transport connect(URI remote, URI local) throws Exception;
-
- Transport connect(URI remote) throws Exception;
- */
S bind(URI location, SC config) throws Exception;
S bind(URI location, IoHandler handler) throws Exception;
-
- /*
- TransportServer bind(URI location) 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/base/AddressFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/AddressFactory.java?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/AddressFactory.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/AddressFactory.java Mon Sep 22 01:12:18 2008
@@ -23,7 +23,7 @@
import java.net.URI;
/**
- * ???
+ * Factory for typed transport addresses.
*
* @version $Rev$ $Date$
*/
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -24,7 +24,7 @@
import org.apache.mina.common.ThreadModel;
/**
- * ???
+ * Provides the base configuration for transport services.
*
* @version $Rev$ $Date$
*/
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -89,16 +89,6 @@
return transport;
}
- /*
- public Transport connect(final URI remote, final URI local) throws Exception {
- return connect(remote, local, (Transport.Configuration) null);
- }
-
- public Transport connect(final URI remote) throws Exception {
- return connect(remote, null);
- }
- */
-
//
// TransportServer Binding
//
@@ -129,10 +119,4 @@
return server;
}
-
- /*
- public TransportServer bind(final URI location) throws Exception {
- return bind(location, (TransportServer.Configuration) null);
- }
- */
}
\ No newline at end of file
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionAdapter.java?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionAdapter.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SessionAdapter.java Mon Sep 22 01:12:18 2008
@@ -33,7 +33,7 @@
import java.io.OutputStream;
/**
- * ???
+ * Adapts a MINA IoSession to a Whipser transport Session.
*
* @version $Rev$ $Date$
*/
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -38,7 +38,6 @@
*
* @version $Rev$ $Date$
*/
-@SuppressWarnings({"FieldCanBeLocal"})
public class ThreadPoolModel
implements ThreadModel
{
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -33,15 +33,18 @@
public class SslTransport
extends TcpTransport
{
- private SSLContextFactory contextFactory;
+ private SSLContextFactory sslContextFactory;
public SslTransport() {
super(new SslAddressFactory());
}
- public SslTransport(final SSLContextFactory contextFactory) {
- this();
- this.contextFactory = contextFactory;
+ public SSLContextFactory getSslContextFactory() {
+ return sslContextFactory;
+ }
+
+ public void setSslContextFactory(final SSLContextFactory sslContextFactory) {
+ this.sslContextFactory = sslContextFactory;
}
@Override
@@ -50,7 +53,7 @@
super.configure(chain);
- SSLFilter filter = new SSLFilter(contextFactory.createClientContext());
+ SSLFilter filter = new SSLFilter(sslContextFactory.createClientContext());
filter.setUseClientMode(true);
chain.addFirst(SSLFilter.class.getSimpleName(), filter);
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -33,15 +33,18 @@
public class SslTransportServer
extends TcpTransportServer
{
- private SSLContextFactory contextFactory;
+ private SSLContextFactory sslContextFactory;
public SslTransportServer() {
super(new SslAddressFactory());
}
- public SslTransportServer(final SSLContextFactory contextFactory) {
- this();
- this.contextFactory = contextFactory;
+ public SSLContextFactory getSslContextFactory() {
+ return sslContextFactory;
+ }
+
+ public void setSslContextFactory(final SSLContextFactory sslContextFactory) {
+ this.sslContextFactory = sslContextFactory;
}
@Override
@@ -50,7 +53,7 @@
super.configure(chain);
- SSLFilter sslFilter = new SSLFilter(contextFactory.createServerContext());
+ SSLFilter sslFilter = new SSLFilter(sslContextFactory.createServerContext());
chain.addFirst(SSLFilter.class.getSimpleName(), sslFilter);
}
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -33,7 +33,7 @@
public class TcpAddressFactory
implements AddressFactory<InetSocketAddress>
{
- public InetSocketAddress create(URI location) throws Exception {
+ public InetSocketAddress create(final URI location) throws Exception {
InetSocketAddress addr = null;
if (location != null) {
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=697695&r1=697694&r2=697695&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 Mon Sep 22 01:12:18 2008
@@ -32,7 +32,7 @@
public class VmAddressFactory
implements AddressFactory<VmPipeAddress>
{
- public VmPipeAddress create(URI location) throws Exception {
+ public VmPipeAddress create(final URI location) throws Exception {
VmPipeAddress addr = null;
if (location != null) {
Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml?rev=697695&r1=697694&r2=697695&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml Mon Sep 22 01:12:18 2008
@@ -59,8 +59,14 @@
<bean id="sslTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportFactory"/>
- <bean id="sslTransport" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransport" scope="prototype"/>
+ <bean id="sslContextFactory" class="org.apache.geronimo.gshell.whisper.ssl.BogusSSLContextFactory"/>
- <bean id="sslTransportServer" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportServer" scope="prototype"/>
+ <bean id="sslTransport" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransport" scope="prototype">
+ <property name="sslContextFactory" ref="sslContextFactory"/>
+ </bean>
+
+ <bean id="sslTransportServer" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportServer" scope="prototype">
+ <property name="sslContextFactory" ref="sslContextFactory"/>
+ </bean>
</beans>
\ No newline at end of file