You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ch...@apache.org on 2004/12/24 02:24:22 UTC
svn commit: r123266 - in geronimo/trunk/modules/security/src: java/org/apache/geronimo/security/remoting/jmx test/org/apache/geronimo/security/network/protocol
Author: chirino
Date: Thu Dec 23 17:24:21 2004
New Revision: 123266
URL: http://svn.apache.org/viewcvs?view=rev&rev=123266
Log:
Updated to use some new enhancments in activeio. You will need to do an online build to download the latest activeio snapshot for your build to work.
Modified:
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java?view=diff&rev=123266&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java&r1=123265&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java&r2=123266
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java Thu Dec 23 17:24:21 2004
@@ -31,7 +31,7 @@
import org.activeio.adapter.SynchToAsynchChannelAdapter;
import org.activeio.adapter.SynchToAsynchChannelServerAdapter;
import org.activeio.filter.PacketAggregatingAsynchChannel;
-import org.activeio.net.TcpSynchChannelFactory;
+import org.activeio.net.SocketSynchChannelFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -94,7 +94,7 @@
}
private AsynchChannelServer createAsynchChannelServer() throws IOException, URISyntaxException {
- TcpSynchChannelFactory factory = new TcpSynchChannelFactory();
+ SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
SynchChannelServer server = factory.bindSynchChannel(bindURI);
return new SynchToAsynchChannelServerAdapter(server);
}
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java?view=diff&rev=123266&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java&r1=123265&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java&r2=123266
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java (original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/RequestChannelInterceptor.java Thu Dec 23 17:24:21 2004
@@ -27,12 +27,10 @@
import org.activeio.RequestChannel;
import org.activeio.Service;
import org.activeio.SynchChannel;
-import org.activeio.adapter.ASynchToSynchChannelAdapter;
import org.activeio.adapter.AsynchChannelToClientRequestChannel;
import org.activeio.adapter.PacketInputStream;
-import org.activeio.adapter.SynchToAsynchChannelAdapter;
-import org.activeio.filter.PacketAggregatingAsynchChannel;
-import org.activeio.net.TcpSynchChannelFactory;
+import org.activeio.filter.PacketAggregatingSynchChannel;
+import org.activeio.net.SocketSynchChannelFactory;
import org.activeio.packet.ByteArrayPacket;
import org.apache.geronimo.core.service.Interceptor;
import org.apache.geronimo.core.service.Invocation;
@@ -88,12 +86,11 @@
}
private static RequestChannel createRequestChannel(URI target) throws IOException, URISyntaxException {
- TcpSynchChannelFactory factory = new TcpSynchChannelFactory();
+ SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
SynchChannel channel = factory.openSynchChannel(target);
return new AsynchChannelToClientRequestChannel(
- new ASynchToSynchChannelAdapter(
- new PacketAggregatingAsynchChannel(
- new SynchToAsynchChannelAdapter(channel))));
+ new PacketAggregatingSynchChannel(
+ channel));
}
/**
Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?view=diff&rev=123266&p1=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java&r1=123265&p2=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java&r2=123266
==============================================================================
--- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java (original)
+++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java Thu Dec 23 17:24:21 2004
@@ -43,7 +43,7 @@
import org.activeio.adapter.SynchToAsynchChannelAdapter;
import org.activeio.adapter.SynchToAsynchChannelServerAdapter;
import org.activeio.filter.PacketAggregatingAsynchChannel;
-import org.activeio.net.TcpSynchChannelFactory;
+import org.activeio.net.SocketSynchChannelFactory;
import org.activeio.packet.ByteArrayPacket;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -78,7 +78,7 @@
*/
public void disabledtest() throws Exception {
- TcpSynchChannelFactory factory = new TcpSynchChannelFactory();
+ SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
final RequestChannel channel =
new AsynchChannelToClientRequestChannel(
new ASynchToSynchChannelAdapter(
@@ -151,9 +151,8 @@
context.login();
serverSubject = context.getSubject();
- TcpSynchChannelFactory factory = new TcpSynchChannelFactory();
- server =
- new SynchToAsynchChannelServerAdapter(
+ SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
+ server = new SynchToAsynchChannelServerAdapter(
factory.bindSynchChannel(new URI("tcp://localhost:0")));
server.setAcceptListener(new AcceptListener() {