You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/11/04 17:29:15 UTC
svn commit: r330836 - in /directory/protocol-providers/kerberos/trunk: ./
src/main/java/org/apache/kerberos/kdc/
src/main/java/org/apache/kerberos/kdc/authentication/
src/main/java/org/apache/kerberos/kdc/ticketgrant/
src/main/java/org/apache/kerberos/...
Author: erodriguez
Date: Fri Nov 4 08:28:59 2005
New Revision: 330836
URL: http://svn.apache.org/viewcvs?rev=330836&view=rev
Log:
Migrated protocol-provider for Kerberos protocol to MINA 0.9.
Added:
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolCodecFactory.java
- copied, changed from r330733, directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java
Removed:
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java
Modified:
directory/protocol-providers/kerberos/trunk/project.xml
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcConfiguration.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcContext.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KerberosServer.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationContext.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationServiceChain.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/GenerateTicket.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/SealReply.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/TicketGrantingContext.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosDecoder.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosEncoder.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/sam/SamException.java
Modified: directory/protocol-providers/kerberos/trunk/project.xml
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/project.xml?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/project.xml (original)
+++ directory/protocol-providers/kerberos/trunk/project.xml Fri Nov 4 08:28:59 2005
@@ -101,7 +101,7 @@
<dependency>
<groupId>directory-network</groupId>
<artifactId>mina</artifactId>
- <version>0.8.0</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>directory-asn1</groupId>
@@ -124,7 +124,7 @@
<build>
<nagEmailAddress>dev@directory.apache.org</nagEmailAddress>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
+ <unitTestSourceDirectory>${basedir}/src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test*</include>
@@ -136,7 +136,7 @@
</excludes>
<resources>
<resource>
- <directory>${basedir}/src/test</directory>
+ <directory>${basedir}/src/test/java</directory>
<includes>
<include>**/*.dtd</include>
<include>**/*.ldif</include>
@@ -148,7 +148,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>${basedir}/src/test</directory>
+ <directory>${basedir}/src/test/java</directory>
<includes>
<include>**/*.dtd</include>
<include>**/*.ldif</include>
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcConfiguration.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcConfiguration.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcConfiguration.java Fri Nov 4 08:28:59 2005
@@ -34,6 +34,8 @@
public class KdcConfiguration extends ServiceConfiguration
{
+ private static final long serialVersionUID = 522567370475574165L;
+
/** the prop key const for kdc principal */
public static final String PRINCIPAL_KEY = "principal";
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcContext.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcContext.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KdcContext.java Fri Nov 4 08:28:59 2005
@@ -26,6 +26,8 @@
public class KdcContext extends ContextBase
{
+ private static final long serialVersionUID = 6490030984626825108L;
+
private KdcConfiguration config;
private PrincipalStore store;
private KdcRequest request;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KerberosServer.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KerberosServer.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KerberosServer.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/KerberosServer.java Fri Nov 4 08:28:59 2005
@@ -20,10 +20,10 @@
import java.io.IOException;
import java.util.Dictionary;
-import org.apache.kerberos.protocol.KerberosProtocolProvider;
+import org.apache.kerberos.protocol.KerberosProtocolHandler;
import org.apache.kerberos.store.PrincipalStore;
+import org.apache.mina.common.IoHandler;
import org.apache.mina.common.TransportType;
-import org.apache.mina.protocol.ProtocolProvider;
import org.apache.mina.registry.Service;
import org.apache.mina.registry.ServiceRegistry;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@
private ServiceRegistry registry;
private PrincipalStore store;
- private ProtocolProvider provider;
+ private IoHandler handler;
private Service tcpService;
private Service udpService;
@@ -60,13 +60,13 @@
try
{
- provider = new KerberosProtocolProvider( new KdcConfiguration(), this.store );
+ handler = new KerberosProtocolHandler( new KdcConfiguration(), this.store );
udpService = new Service( name, TransportType.DATAGRAM, port );
tcpService = new Service( name, TransportType.SOCKET, port );
- registry.bind( udpService, provider );
- registry.bind( tcpService, provider );
+ registry.bind( udpService, handler );
+ registry.bind( tcpService, handler );
log.debug( name + " listening on port " + port );
}
@@ -87,7 +87,7 @@
registry.unbind( tcpService );
registry = null;
- provider = null;
+ handler = null;
udpService = null;
tcpService = null;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationContext.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationContext.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationContext.java Fri Nov 4 08:28:59 2005
@@ -27,6 +27,8 @@
public class AuthenticationContext extends KdcContext
{
+ private static final long serialVersionUID = -2249170923251265359L;
+
private Map checksumEngines = new HashMap();
private Ticket ticket;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationServiceChain.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationServiceChain.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationServiceChain.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/authentication/AuthenticationServiceChain.java Fri Nov 4 08:28:59 2005
@@ -19,14 +19,9 @@
import org.apache.kerberos.kdc.MonitorRequest;
import org.apache.kerberos.kdc.preauthentication.PreAuthenticationChain;
import org.apache.protocol.common.chain.impl.ChainBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class AuthenticationServiceChain extends ChainBase
{
- /** the log for this class */
- private static final Logger log = LoggerFactory.getLogger( AuthenticationServiceChain.class );
-
public AuthenticationServiceChain()
{
super();
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/GenerateTicket.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/GenerateTicket.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/GenerateTicket.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/GenerateTicket.java Fri Nov 4 08:28:59 2005
@@ -39,14 +39,9 @@
import org.apache.kerberos.service.LockBox;
import org.apache.protocol.common.chain.Context;
import org.apache.protocol.common.chain.impl.CommandBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class GenerateTicket extends CommandBase
{
- /** the log for this class */
- private static final Logger log = LoggerFactory.getLogger( GenerateTicket.class );
-
public boolean execute( Context context ) throws Exception
{
TicketGrantingContext tgsContext = (TicketGrantingContext) context;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/SealReply.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/SealReply.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/SealReply.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/SealReply.java Fri Nov 4 08:28:59 2005
@@ -23,14 +23,9 @@
import org.apache.kerberos.service.LockBox;
import org.apache.protocol.common.chain.Context;
import org.apache.protocol.common.chain.impl.CommandBase;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class SealReply extends CommandBase
{
- /** the log for this class */
- private static final Logger log = LoggerFactory.getLogger( SealReply.class );
-
public boolean execute( Context ctx ) throws Exception
{
TicketGrantingContext tgsContext = (TicketGrantingContext) ctx;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/TicketGrantingContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/TicketGrantingContext.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/TicketGrantingContext.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/kdc/ticketgrant/TicketGrantingContext.java Fri Nov 4 08:28:59 2005
@@ -26,6 +26,8 @@
public class TicketGrantingContext extends KdcContext
{
+ private static final long serialVersionUID = 2130665703752837491L;
+
private ApplicationRequest authHeader;
private Ticket tgt;
private Ticket newTicket;
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosDecoder.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosDecoder.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosDecoder.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosDecoder.java Fri Nov 4 08:28:59 2005
@@ -20,25 +20,20 @@
import org.apache.kerberos.io.decoder.KdcRequestDecoder;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.protocol.ProtocolDecoder;
-import org.apache.mina.protocol.ProtocolDecoderOutput;
-import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.ProtocolViolationException;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
public class KerberosDecoder implements ProtocolDecoder
{
private KdcRequestDecoder decoder = new KdcRequestDecoder();
- public void decode( ProtocolSession session, ByteBuffer in, ProtocolDecoderOutput out )
- throws ProtocolViolationException
+ public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws IOException
+ {
+ out.write( decoder.decode( in.buf() ) );
+ }
+
+ public void dispose( IoSession session ) throws Exception
{
- try
- {
- out.write( decoder.decode( in.buf() ) );
- }
- catch ( IOException ioe )
- {
- ioe.printStackTrace();
- }
}
}
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosEncoder.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosEncoder.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosEncoder.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosEncoder.java Fri Nov 4 08:28:59 2005
@@ -23,42 +23,37 @@
import org.apache.kerberos.messages.ErrorMessage;
import org.apache.kerberos.messages.KdcReply;
import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.protocol.ProtocolEncoder;
-import org.apache.mina.protocol.ProtocolEncoderOutput;
-import org.apache.mina.protocol.ProtocolSession;
-import org.apache.mina.protocol.ProtocolViolationException;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
public class KerberosEncoder implements ProtocolEncoder
{
private KdcReplyEncoder replyEncoder = new KdcReplyEncoder();
private ErrorMessageEncoder errorEncoder = new ErrorMessageEncoder();
- public void encode( ProtocolSession session, Object message, ProtocolEncoderOutput out )
- throws ProtocolViolationException
+ public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws IOException
{
ByteBuffer buf = ByteBuffer.allocate( 1024 );
- try
+ if ( message instanceof KdcReply )
{
- if ( message instanceof KdcReply )
- {
- replyEncoder.encode( (KdcReply) message, buf.buf() );
- }
- else
+ replyEncoder.encode( (KdcReply) message, buf.buf() );
+ }
+ else
+ {
+ if ( message instanceof ErrorMessage )
{
- if ( message instanceof ErrorMessage )
- {
- errorEncoder.encode( (ErrorMessage) message, buf.buf() );
- }
+ errorEncoder.encode( (ErrorMessage) message, buf.buf() );
}
+ }
- buf.flip();
+ buf.flip();
- out.write( buf );
- }
- catch ( IOException ioe )
- {
- throw new ProtocolViolationException();
- }
+ out.write( buf );
+ }
+
+ public void dispose( IoSession arg0 ) throws Exception
+ {
}
}
Copied: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolCodecFactory.java (from r330733, directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java)
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolCodecFactory.java?p2=directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolCodecFactory.java&p1=directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java&r1=330733&r2=330836&rev=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolCodecFactory.java Fri Nov 4 08:28:59 2005
@@ -16,47 +16,32 @@
*/
package org.apache.kerberos.protocol;
-import org.apache.kerberos.kdc.KdcConfiguration;
-import org.apache.kerberos.store.PrincipalStore;
-import org.apache.mina.protocol.ProtocolCodecFactory;
-import org.apache.mina.protocol.ProtocolDecoder;
-import org.apache.mina.protocol.ProtocolEncoder;
-import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolProvider;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
-public class KerberosProtocolProvider implements ProtocolProvider
+public class KerberosProtocolCodecFactory implements ProtocolCodecFactory
{
- // Protocol handler is usually a singleton.
- private static ProtocolHandler HANDLER;
+ private static final KerberosProtocolCodecFactory INSTANCE = new KerberosProtocolCodecFactory();
- // Codec factory is also usually a singleton.
- private static ProtocolCodecFactory CODEC_FACTORY = new ProtocolCodecFactory()
+ public static KerberosProtocolCodecFactory getInstance()
{
- public ProtocolEncoder newEncoder()
- {
- // Create a new encoder.
- return new KerberosEncoder();
- }
-
- public ProtocolDecoder newDecoder()
- {
- // Create a new decoder.
- return new KerberosDecoder();
- }
- };
+ return INSTANCE;
+ }
- public KerberosProtocolProvider( KdcConfiguration config, PrincipalStore store )
+ private KerberosProtocolCodecFactory()
{
- HANDLER = new KerberosProtocolHandler( config, store );
}
- public ProtocolCodecFactory getCodecFactory()
+ public ProtocolEncoder getEncoder()
{
- return CODEC_FACTORY;
+ // Create a new encoder.
+ return new KerberosEncoder();
}
- public ProtocolHandler getHandler()
+ public ProtocolDecoder getDecoder()
{
- return HANDLER;
+ // Create a new decoder.
+ return new KerberosDecoder();
}
}
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java Fri Nov 4 08:28:59 2005
@@ -28,8 +28,9 @@
import org.apache.kerberos.messages.KdcRequest;
import org.apache.kerberos.store.PrincipalStore;
import org.apache.mina.common.IdleStatus;
-import org.apache.mina.protocol.ProtocolHandler;
-import org.apache.mina.protocol.ProtocolSession;
+import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.protocol.common.chain.Command;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,9 +40,9 @@
* service and the ticket granting service of the KDC.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
+ * @version $Rev$, $Date$
*/
-public class KerberosProtocolHandler implements ProtocolHandler
+public class KerberosProtocolHandler implements IoHandler
{
private static final Logger log = LoggerFactory.getLogger( KerberosProtocolHandler.class );
@@ -60,15 +61,18 @@
tgsService = new TicketGrantingServiceChain();
}
- public void sessionCreated( ProtocolSession session )
+ public void sessionCreated( IoSession session ) throws Exception
{
if ( log.isDebugEnabled() )
{
log.debug( session.getRemoteAddress() + " CREATED" );
}
+
+ session.getFilterChain().addFirst( "codec",
+ new ProtocolCodecFilter( KerberosProtocolCodecFactory.getInstance() ) );
}
- public void sessionOpened( ProtocolSession session )
+ public void sessionOpened( IoSession session )
{
if ( log.isDebugEnabled() )
{
@@ -76,7 +80,7 @@
}
}
- public void sessionClosed( ProtocolSession session )
+ public void sessionClosed( IoSession session )
{
if ( log.isDebugEnabled() )
{
@@ -84,7 +88,7 @@
}
}
- public void sessionIdle( ProtocolSession session, IdleStatus status )
+ public void sessionIdle( IoSession session, IdleStatus status )
{
if ( log.isDebugEnabled() )
{
@@ -92,13 +96,13 @@
}
}
- public void exceptionCaught( ProtocolSession session, Throwable cause )
+ public void exceptionCaught( IoSession session, Throwable cause )
{
log.error( session.getRemoteAddress() + " EXCEPTION", cause );
session.close();
}
- public void messageReceived( ProtocolSession session, Object message )
+ public void messageReceived( IoSession session, Object message )
{
if ( log.isDebugEnabled() )
{
@@ -152,7 +156,7 @@
}
}
- public void messageSent( ProtocolSession session, Object message )
+ public void messageSent( IoSession session, Object message )
{
if ( log.isDebugEnabled() )
{
Modified: directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/sam/SamException.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/sam/SamException.java?rev=330836&r1=330835&r2=330836&view=diff
==============================================================================
--- directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/sam/SamException.java (original)
+++ directory/protocol-providers/kerberos/trunk/src/main/java/org/apache/kerberos/sam/SamException.java Fri Nov 4 08:28:59 2005
@@ -27,6 +27,8 @@
*/
public class SamException extends Exception
{
+ private static final long serialVersionUID = -677444708375928227L;
+
/** the SAM type that caused this exception */
private final SamType type;