svn commit: rev 57130 - in incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos: changepw kdc

[erodriguez]

Author: erodriguez
Date: Tue Nov  9 19:50:15 2004
New Revision: 57130

Modified:
   
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java
   
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/KdcDispatcher.java
Log:
CryptoService no longer needed.  Removed from where it was instantiated.

Modified: 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java
     (original)
+++ 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java
     Tue Nov  9 19:50:15 2004
@@ -23,7 +23,6 @@
 import org.apache.kerberos.changepw.messages.ChangePasswordReply;
 import org.apache.kerberos.changepw.messages.ChangePasswordRequest;
 import org.apache.kerberos.changepw.store.PasswordStore;
-import org.apache.kerberos.crypto.CryptoService;
 import org.apache.kerberos.kdc.KdcConfiguration;
 import org.apache.kerberos.kdc.KerberosException;
 import org.apache.kerberos.kdc.store.BootstrapStore;
@@ -34,7 +33,6 @@
 public class ChangePasswordDispatcher
 {
        private PrincipalStore   bootstrap;
-       private CryptoService    cryptoService;
        private KdcConfiguration config;
        private PasswordStore    store;
        
@@ -47,9 +45,8 @@
                this.bootstrap = bootstrap;
                this.store     = store;
                
-               cryptoService   = new CryptoService();
         errorService    = new ChangePasswordErrorService(this.config);
-               changepwService = new ChangePasswordService(this.store, 
this.bootstrap, cryptoService, this.config);
+               changepwService = new ChangePasswordService(this.store, 
this.bootstrap, this.config);
        }
        
        public byte[] dispatch(byte[] requestBytes) throws IOException

Modified: 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/KdcDispatcher.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/KdcDispatcher.java
     (original)
+++ 
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/KdcDispatcher.java
     Tue Nov  9 19:50:15 2004
@@ -16,14 +16,21 @@
  */
 package org.apache.kerberos.kdc;
 
-import org.apache.kerberos.crypto.*;
-import org.apache.kerberos.io.decoder.*;
-import org.apache.kerberos.io.encoder.*;
-import org.apache.kerberos.kdc.replay.*;
-import org.apache.kerberos.kdc.store.*;
-import org.apache.kerberos.messages.*;
+import org.apache.kerberos.io.decoder.KdcRequestDecoder;
+import org.apache.kerberos.io.encoder.ErrorMessageEncoder;
+import org.apache.kerberos.io.encoder.KdcReplyEncoder;
+import org.apache.kerberos.kdc.replay.InMemoryReplayCache;
+import org.apache.kerberos.kdc.replay.ReplayCache;
+import org.apache.kerberos.kdc.store.BootstrapStore;
+import org.apache.kerberos.kdc.store.PrincipalStore;
+import org.apache.kerberos.messages.AuthenticationReply;
+import org.apache.kerberos.messages.ErrorMessage;
+import org.apache.kerberos.messages.KdcRequest;
+import org.apache.kerberos.messages.TicketGrantReply;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 public class KdcDispatcher {
        
@@ -39,7 +46,6 @@
        private ErrorMessageEncoder _errorEncoder = new ErrorMessageEncoder();
        
        private PrincipalStore   _bootstrap;
-       private CryptoService    _cryptoService;
        private KdcConfiguration _config;
        private PrincipalStore   _store;
        
@@ -52,10 +58,9 @@
                _bootstrap = bootstrap;
                _store     = store;
                
-               _cryptoService = new CryptoService();
                _errorService  = new ErrorService(_config);
-               _authService   = new AuthenticationService(_store, _bootstrap, 
_cryptoService, _config);
-               _tgsService    = new TicketGrantingService(_store, _bootstrap, 
_cryptoService, _config, _replay);
+               _authService   = new AuthenticationService(_store, _bootstrap, 
_config);
+               _tgsService    = new TicketGrantingService(_store, _bootstrap, 
_config, _replay);
        }
        
        public byte[] dispatch(byte[] requestBytes) throws IOException {