Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 36625 invoked from network); 10 Nov 2004 03:50:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Nov 2004 03:50:19 -0000 Received: (qmail 60441 invoked by uid 500); 10 Nov 2004 03:50:18 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 60385 invoked by uid 500); 10 Nov 2004 03:50:17 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 60372 invoked by uid 99); 10 Nov 2004 03:50:17 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 09 Nov 2004 19:50:17 -0800 Received: (qmail 36565 invoked by uid 65534); 10 Nov 2004 03:50:16 -0000 Date: 10 Nov 2004 03:50:16 -0000 Message-ID: <20041110035016.36562.qmail@minotaur.apache.org> From: erodriguez@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 57130 - in incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos: changepw kdc X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 {