geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r123681 - in geronimo/trunk/modules/security/src: java/org/apache/geronimo/security/network/protocol java/org/apache/geronimo/security/remoting/jmx test/org/apache/geronimo/security/network/protocol
Date Wed, 29 Dec 2004 23:02:35 GMT
Author: chirino
Date: Wed Dec 29 15:02:33 2004
New Revision: 123681

URL: http://svn.apache.org/viewcvs?view=rev&rev=123681
Log:
Fixed typo in activeio class names.
Modified:
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
   geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.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/network/protocol/SubjectCarryingChannel.java
Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java?view=diff&rev=123681&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java&r1=123680&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java&r2=123681
==============================================================================
--- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
(original)
+++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/network/protocol/SubjectCarryingChannel.java
Wed Dec 29 15:02:33 2004
@@ -151,12 +151,12 @@
         os.writeLong(subjectId.longValue());
         os.writeInt(hash.length);
         os.close();
-        return new AppendedPacket(header.flip(), new ByteArrayPacket(hash));
+        return AppendedPacket.join(header.flip(), new ByteArrayPacket(hash));
     }
 
     private Packet createPassthroughPacket(Packet packet) {
         header.clear().write(PASSTHROUGH);        
-        return new AppendedPacket(header.flip(),packet);
+        return AppendedPacket.join(header.flip(),packet);
     }
 
     public Subject getLocalSubject() {

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=123681&p1=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java&r1=123680&p2=geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java&r2=123681
==============================================================================
--- 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
Wed Dec 29 15:02:33 2004
@@ -104,7 +104,7 @@
         
         return new AsynchChannelToServerRequestChannel( 
                 new PacketAggregatingAsynchChannel(
-                        new SynchToAsynchChannelAdapter(channel))) {            
+                        SynchToAsynchChannelAdapter.adapt(channel))) {            
             /**
              * close out the channel once one request has been serviced.
              */

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=123681&p1=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java&r1=123680&p2=geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java&r2=123681
==============================================================================
--- 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
Wed Dec 29 15:02:33 2004
@@ -37,9 +37,9 @@
 import org.activeio.RequestChannel;
 import org.activeio.RequestListener;
 import org.activeio.SynchChannel;
-import org.activeio.adapter.ASynchToSynchChannelAdapter;
 import org.activeio.adapter.AsynchChannelToClientRequestChannel;
 import org.activeio.adapter.AsynchChannelToServerRequestChannel;
+import org.activeio.adapter.AsynchToSynchChannelAdapter;
 import org.activeio.adapter.SynchToAsynchChannelAdapter;
 import org.activeio.adapter.SynchToAsynchChannelServerAdapter;
 import org.activeio.filter.PacketAggregatingAsynchChannel;
@@ -81,10 +81,10 @@
         SocketSynchChannelFactory factory = new SocketSynchChannelFactory();
         final RequestChannel channel = 
             new AsynchChannelToClientRequestChannel(
-                new ASynchToSynchChannelAdapter(
+                AsynchToSynchChannelAdapter.adapt(
                     new SubjectCarryingChannel(
                         new PacketAggregatingAsynchChannel( 
-                            new SynchToAsynchChannelAdapter(
+                            SynchToAsynchChannelAdapter.adapt(
                                  factory.openSynchChannel(serverURI))))));        
         try { 
             channel.start();

Mime
View raw message